Merge branch 'buildFix' of https://github.com/jokajak/password-manager

Conflicts:
	frontend/gamma/properties/gamma.properties.json

1 files changed, 1 insertions, 1 deletions

diff --git a/frontend/gamma/properties/gamma.properties.json b/frontend/gamma/properties/gamma.properties.json
index 0a513e8..c847812 100644
--- a/frontend/gamma/properties/gamma.properties.json
+++ b/frontend/gamma/properties/gamma.properties.json
@@ -1,191 +1,191 @@
 {
 	"copyright.values": {             
 		"mochikit.repository": "https://github.com/mochi/mochikit.git",
 		"mochikit.version": "fe8d17bb9ac0a4e5ad4a8d5c2c94a6fac1c92d75"
 	},
 
 	"html.template": "index_template.html",
 
 	"js": [
 		"MochiKit/Base.js",
 		"MochiKit/Iter.js",
 		"MochiKit/Logging.js",
 		"-- MochiKit/DateTime.js",
 		"MochiKit/Format.js",
 		"MochiKit/Async.js",
 		"MochiKit/DOM.js",
 		"MochiKit/Style.js",
 		"MochiKit/LoggingPane.js",
 		"MochiKit/Color.js",
 		"MochiKit/Signal.js",
 		"MochiKit/Position.js",
 		"MochiKit/Selector.js",
 		"MochiKit/Visual.js",
 
 		"JSON/json2.js",
 
 		"Clipperz/YUI/Utils.js",
 		"Clipperz/YUI/DomHelper.js",
 
 		"Clipperz/ByteArray.js",
 		"Clipperz/Base.js",
 		"Clipperz/Async.js",
 		"Clipperz/CSVProcessor.js",
 		"Clipperz/KeePassExportProcessor.js",
 		"Clipperz/Date.js",
 		"Clipperz/DOM.js",
 		"Clipperz/Logging.js",
 		"Clipperz/Signal.js",
 		"Clipperz/Style.js",
 		"Clipperz/Visual.js",
 		"Clipperz/Set.js",
 		"-- Clipperz/Profile.js",
 		"Clipperz/KeyValueObjectStore.js",
 
 		"Clipperz/Crypto/SHA.js",
 		"Clipperz/Crypto/AES.js",
 		"Clipperz/Crypto/PRNG.js",
 		"Clipperz/Crypto/BigInt.js",
 		"Clipperz/Crypto/Base.js",
 		"Clipperz/Crypto/SRP.js",
 		"Clipperz/Crypto/RSA.js",
 
 		"Clipperz/PM/Strings/Strings_defaults.js",
 		"Clipperz/PM/Strings/Strings_en-US.js",
 		"-- # Clipperz/PM/Strings/Strings_en-GB.js",
 		"-- # Clipperz/PM/Strings/Strings_en-CA.js",
 		"-- Clipperz/PM/Strings/Strings_it-IT.js",
 		"-- Clipperz/PM/Strings/Strings_pt-BR.js",
 		"-- # Clipperz/PM/Strings/Strings_pt-PT.js",
 		"-- Clipperz/PM/Strings/Strings_ja-JP.js",
 		"-- Clipperz/PM/Strings/Strings_zh-CN.js",
 		"-- Clipperz/PM/Strings/Strings_es-ES.js",
 		"-- Clipperz/PM/Strings/Strings_fr-FR.js",
 		"-- # Clipperz/PM/Strings/Strings_de-DE.js",
 		"-- # Clipperz/PM/Strings/Strings_el-GR.js",
 		"-- # Clipperz/PM/Strings/Strings_ru-RU.js",
 		"-- # Clipperz/PM/Strings/Strings_he-IL.js",
 		"Clipperz/PM/Strings.js",
 		"-- Clipperz/PM/Strings/MessagePanelConfigurations.js",
 
 		"Clipperz/PM/Date.js",
 
 		"Clipperz/PM/Toll.js",
 		"Clipperz/PM/Proxy.js",
 		"Clipperz/PM/Proxy/Proxy.JSON.js",
 		"Clipperz/PM/Proxy/Proxy.Offline.js",
 		"Clipperz/PM/Proxy/Proxy.Offline.DataStore.js",
 		"Clipperz/PM/Connection.js",
 		"Clipperz/PM/Crypto.js",
 		"Clipperz/PM/BookmarkletProcessor.js",
 
 		"Clipperz/PM/DataModel/EncryptedRemoteObject.js",
 		"Clipperz/PM/DataModel/User.js",
 		"Clipperz/PM/DataModel/User.Header.Legacy.js",
 		"Clipperz/PM/DataModel/User.Header.RecordIndex.js",
 		"Clipperz/PM/DataModel/User.Header.Preferences.js",
 		"Clipperz/PM/DataModel/User.Header.OneTimePasswords.js",
 		"Clipperz/PM/DataModel/Record.js",
 		"Clipperz/PM/DataModel/Record.Version.js",
 		"Clipperz/PM/DataModel/Record.Version.Field.js",
 		"Clipperz/PM/DataModel/DirectLogin.js",
 		"Clipperz/PM/DataModel/DirectLoginInput.js",
 		"Clipperz/PM/DataModel/DirectLoginBinding.js",
 		"Clipperz/PM/DataModel/DirectLoginFormValue.js",
 		"Clipperz/PM/DataModel/OneTimePassword.js",
 
 		"Clipperz/PM/UI/Canvas/Marks/exclamationMark.js",
 		"Clipperz/PM/UI/Canvas/Marks/questionMark.js",
 		"Clipperz/PM/UI/Canvas/Marks/info.js",
 
 		"Clipperz/PM/UI/Canvas/Features/store.js",
 		"Clipperz/PM/UI/Canvas/Features/protect.js",
 		"Clipperz/PM/UI/Canvas/Features/directLogin.js",
 		"Clipperz/PM/UI/Canvas/Features/share.js",
 
 		"Clipperz/PM/UI/Canvas/Star/normal.js",
 
 		"Clipperz/PM/UI/Canvas/CoverActions/look.js",
 		"Clipperz/PM/UI/Canvas/CoverActions/download.js",
 
 		"Clipperz/PM/UI/Canvas/Tips/open.js",
 		"Clipperz/PM/UI/Canvas/Tips/close.js",
 
 		"Clipperz/PM/UI/Canvas/RegisterButton/normal.js",
 
 		"Clipperz/PM/UI/Canvas/Logo/normal.js",
 
 		"Clipperz/PM/UI/Canvas/GraphicFunctions.js",
 
 		"Clipperz/PM/UI/Common/Components/BaseComponent.js",
 		"Clipperz/PM/UI/Common/Components/Button.js",
 		"Clipperz/PM/UI/Common/Components/ComponentSlot.js",
 		"Clipperz/PM/UI/Common/Components/FaviconComponent.js",
 		"Clipperz/PM/UI/Common/Components/PasswordEntropyDisplay.js",
 		"Clipperz/PM/UI/Common/Components/ProgressBar.js",
 		"Clipperz/PM/UI/Common/Components/SimpleMessagePanel.js",
 		"Clipperz/PM/UI/Common/Components/MessagePanelWithProgressBar.js",
 		"Clipperz/PM/UI/Common/Components/TabPanelComponent.js",
 		"Clipperz/PM/UI/Common/Components/Tooltip.js",
 		"Clipperz/PM/UI/Common/Components/TranslatorWidget.js",
 
 		"Clipperz/PM/UI/Common/Controllers/DirectLoginRunner.js",
 		"Clipperz/PM/UI/Common/Controllers/ProgressBarController.js",
 		"Clipperz/PM/UI/Common/Controllers/TabPanelController.js",
 		"Clipperz/PM/UI/Common/Controllers/WizardController.js",
 
 		"Clipperz/PM/UI/Web/Components/Page.js",
 		"Clipperz/PM/UI/Web/Components/PageHeader.js",
 		"Clipperz/PM/UI/Web/Components/PageFooter.js",
 		"Clipperz/PM/UI/Web/Components/LoginPage.js",
 		"Clipperz/PM/UI/Web/Components/LoginForm.js",
 		"Clipperz/PM/UI/Web/Components/LoginProgress.js",
 		"Clipperz/PM/UI/Web/Components/AppPage.js",
 		"Clipperz/PM/UI/Web/Components/UserInfoBox.js",
 		"Clipperz/PM/UI/Web/Components/TabSidePanel.js",
 		"Clipperz/PM/UI/Web/Components/GridComponent.js",
 
 		"Clipperz/PM/UI/Web/Components/ColumnManager.js",
 		"Clipperz/PM/UI/Web/Components/TextColumnManager.js",
 		"Clipperz/PM/UI/Web/Components/FaviconColumnManager.js",
 		"Clipperz/PM/UI/Web/Components/ImageColumnManager.js",
 		"Clipperz/PM/UI/Web/Components/DateColumnManager.js",
 		"Clipperz/PM/UI/Web/Components/LinkColumnManager.js",
 		"Clipperz/PM/UI/Web/Components/DirectLoginColumnManager.js",
 		"Clipperz/PM/UI/Web/Components/DirectLoginsColumnManager.js",
 		"Clipperz/PM/UI/Web/Components/DeleteObjectColumnManager.js",
 		"Clipperz/PM/UI/Web/Components/CreateNewCardSplashComponent.js",
 
 		"Clipperz/PM/UI/Web/Components/AccountPanel.js",
 		"Clipperz/PM/UI/Web/Components/DataPanel.js",
 		"Clipperz/PM/UI/Web/Components/ToolsPanel.js",
 		"Clipperz/PM/UI/Web/Components/RulerComponent.js",
 		"Clipperz/PM/UI/Web/Components/CardDialogComponent.js",
 		"Clipperz/PM/UI/Web/Components/CardDialogRecordFieldComponent.js",
 		"Clipperz/PM/UI/Web/Components/CardDialogRecordDirectLoginComponent.js",
 		"Clipperz/PM/UI/Web/Components/DirectLoginEditingComponent.js",
 		"Clipperz/PM/UI/Web/Components/DirectLoginEditingBindingComponent.js",
 		"Clipperz/PM/UI/Web/Components/DirectLoginEditingFormValueComponent.js",
 		"Clipperz/PM/UI/Web/Components/BookmarkletComponent.js",
 		"Clipperz/PM/UI/Web/Components/UnlockPasswordComponent.js",
 		"Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js",
 		"Clipperz/PM/UI/Web/Components/PasswordTooltip.js",
 
 		"Clipperz/PM/UI/Web/Controllers/MainController.js",
 		"Clipperz/PM/UI/Web/Controllers/LoginController.js",
 		"Clipperz/PM/UI/Web/Controllers/AppController.js",
 		"Clipperz/PM/UI/Web/Controllers/FilterController.js",
 		"Clipperz/PM/UI/Web/Controllers/GridController.js",
 		"Clipperz/PM/UI/Web/Controllers/CardsController.js",
 		"Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js",
 		"Clipperz/PM/UI/Web/Controllers/CardDialogController.js",
 		"Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js",
 		"Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js",
 
 		"main.js"
 	],
 
 	"css": [
 		"web.css"
 	]
-}
\ No newline at end of file
+}