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

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

1 files changed, 4 insertions, 1 deletions

diff --git a/frontend/beta/properties/beta.properties.json b/frontend/beta/properties/beta.properties.json
index 476becd..810215b 100644
--- a/frontend/beta/properties/beta.properties.json
+++ b/frontend/beta/properties/beta.properties.json
@@ -1,187 +1,190 @@
 {
         "copyright.values": {             
                 "mochikit.repository": "http://svn.mochikit.com/mochikit/trunk/",
                 "mochikit.version": "1249"
         },
 
         "html.template": "index_template.html",
 
         "js": [
                 "MochiKit/Base.js",
                 "MochiKit/Iter.js",
                 "MochiKit/DOM.js",
                 "MochiKit/Style.js",
                 "MochiKit/Signal.js",
                 "MochiKit/Format.js",
                 "MochiKit/Async.js",
                 "MochiKit/Selector.js",
                 "MochiKit/Logging.js",
                 "MochiKit/LoggingPane.js",
 
                 "YUI/yahoo.js",
                 "YUI/animation.js",
                 "YUI/event.js",
                 "YUI/dom.js",
                 "YUI/dragdrop.js",
                 "YUI/logger.js",
 
                 "YUI-extensions/yutil.js",
                 "YUI-extensions/Bench.js",
                 "YUI-extensions/Date.js",
                 "YUI-extensions/DomHelper.js",
                 "YUI-extensions/Element.js",
                 "YUI-extensions/CompositeElement.js",
                 "YUI-extensions/State.js",
                 "YUI-extensions/EventManager.js",
                 "YUI-extensions/KeyMap.js",
                 "YUI-extensions/Layer.js",
                 "YUI-extensions/MixedCollection.js",
                 "YUI-extensions/State.js",
                 "YUI-extensions/UpdateManager.js",
                 "YUI-extensions/anim/Actor.js",
                 "YUI-extensions/anim/Animator.js",
                 "YUI-extensions/dd/Registry.js",
                 "YUI-extensions/dd/ScrollManager.js",
                 "YUI-extensions/dd/StatusProxy.js",
                 "YUI-extensions/layout/ContentPanels.js",
                 "YUI-extensions/layout/LayoutManager.js",
                 "YUI-extensions/layout/BorderLayout.js",
                 "YUI-extensions/layout/BasicLayoutRegion.js",
                 "YUI-extensions/layout/LayoutRegion.js",
                 "YUI-extensions/layout/LayoutStateManager.js",
                 "YUI-extensions/layout/SplitLayoutRegion.js",
                 "YUI-extensions/layout/BorderLayoutRegions.js",
                 "YUI-extensions/widgets/BasicDialog.js",
                 "YUI-extensions/widgets/Button.js",
                 "YUI-extensions/widgets/MessageBox.js",
                 "YUI-extensions/widgets/Resizable.js",
                 "YUI-extensions/widgets/SplitBar.js",
                 "YUI-extensions/widgets/TabPanel.js",
                 "YUI-extensions/widgets/TemplateView.js",
                 "YUI-extensions/widgets/Toolbar.js",
                 "YUI-extensions/widgets/InlineEditor.js",
                 "YUI-extensions/widgets/QuickTips.js",
                 "YUI-extensions/CSS.js",
 
                 "JSON/json2.js",
 
                 "Clipperz/ByteArray.js",
                 "Clipperz/Base.js",
                 "Clipperz/CSVProcessor.js",
                 "Clipperz/KeePassExportProcessor.js",
                 "Clipperz/Date.js",
                 "Clipperz/DOM.js",
                 "Clipperz/Signal.js",
                 "Clipperz/Style.js",
                 "Clipperz/Set.js",
                 "Clipperz/NotificationCenter.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_en-US.js",
                 "Clipperz/PM/Strings/Strings_it-IT.js",
                 "Clipperz/PM/Strings/Strings_pt-BR.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_ru-RU.js",
                 "Clipperz/PM/Strings.js",
                 "Clipperz/PM/Strings/MessagePanelConfigurations.js",
                 "Clipperz/PM/Date.js",
                 "Clipperz/PM/Components/BaseComponent.js",
                 "Clipperz/PM/Components/MessageBox.js",
                 "Clipperz/PM/Components/TextFormField.js",
                 "Clipperz/PM/Components/PasswordEntropyDisplay.js",
                 "Clipperz/PM/Components/PasswordGenerator.js",
                 "Clipperz/PM/Components/Panels/BasePanel.js",
                 "Clipperz/PM/Components/Panels/LoginPanel.js",
                 "Clipperz/PM/Components/Panels/MainPanel.js",
                 "Clipperz/PM/Components/Panels/AccountPanel.js",
                 "Clipperz/PM/Components/Panels/DataPanel.js",
                 "Clipperz/PM/Components/Panels/ContactsPanel.js",
                 "Clipperz/PM/Components/Panels/ToolsPanel.js",
                 "Clipperz/PM/Components/Panels/LogoutPanel.js",
                 "Clipperz/PM/Components/RecordDetail/MainComponent.js",
                 "Clipperz/PM/Components/RecordDetail/AbstractComponent.js",
                 "Clipperz/PM/Components/RecordDetail/HeaderComponent.js",
                 "Clipperz/PM/Components/RecordDetail/TitleComponent.js",
                 "Clipperz/PM/Components/RecordDetail/NotesComponent.js",
                 "Clipperz/PM/Components/RecordDetail/FieldComponent.js",
                 "Clipperz/PM/Components/RecordDetail/AbstractFieldSubComponent.js",
                 "Clipperz/PM/Components/RecordDetail/FieldButtonComponent.js",
                 "Clipperz/PM/Components/RecordDetail/FieldLabelComponent.js",
                 "Clipperz/PM/Components/RecordDetail/FieldDragHandler.js",
                 "Clipperz/PM/Components/RecordDetail/FieldValueComponent.js",
                 "Clipperz/PM/Components/RecordDetail/FieldTypeComponent.js",
                 "Clipperz/PM/Components/RecordDetail/DirectLoginsComponent.js",
                 "Clipperz/PM/Components/RecordDetail/DirectLoginComponent.js",
                 "Clipperz/PM/Components/RecordDetail/DirectLoginBindingComponent.js",
                 "Clipperz/PM/Components/RecordDetail/DirectLoginValueComponent.js",
                 "Clipperz/PM/Components/RecordDetail/CreationWizard.js",
                 "Clipperz/PM/Components/TabPanel/TabPanelController.js",
                 "Clipperz/PM/Components/Import/MainComponent.js",
                 "Clipperz/PM/Components/Import/GenericImportComponent.js",
                 "Clipperz/PM/Components/Import/CSVImportComponent.js",
                 "Clipperz/PM/Components/Import/CSVImport/CSVImportColumns.js",
                 "Clipperz/PM/Components/Import/CSVImport/CSVImportHeader.js",
                 "Clipperz/PM/Components/Import/CSVImport/CSVImportTitle.js",
                 "Clipperz/PM/Components/Import/CSVImport/CSVImportNotes.js",
                 "Clipperz/PM/Components/Import/CSVImport/CSVImportFields.js",
                 "Clipperz/PM/Components/Import/ExcelImportComponent.js",
                 "Clipperz/PM/Components/Import/PasswordPlusImportComponent.js",
                 "Clipperz/PM/Components/Import/ClipperzImportComponent.js",
                 "Clipperz/PM/Components/Import/RoboFormImportComponent.js",
                 "Clipperz/PM/Components/Import/KeePassImportComponent.js",
                 "Clipperz/PM/Components/Printing/Header.js",
                 "Clipperz/PM/Components/Printing/Record.js",
                 "Clipperz/PM/Components/Printing/Footer.js",
                 "Clipperz/PM/Components/OTP/MainComponent.js",
                 "Clipperz/PM/Components/Compact/CompactHeader.js",
                 "Clipperz/PM/Components/Compact/LoginForm.js",
                 "Clipperz/PM/Components/Compact/CompactInterface.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/User.js",
                 "Clipperz/PM/DataModel/UserPreferences.js",
                 "Clipperz/PM/DataModel/Header.js",
                 "Clipperz/PM/DataModel/Statistics.js",
                 "Clipperz/PM/DataModel/Record.js",
                 "Clipperz/PM/DataModel/RecordField.js",
                 "Clipperz/PM/DataModel/RecordVersion.js",
                 "Clipperz/PM/DataModel/DirectLogin.js",
                 "Clipperz/PM/DataModel/DirectLoginReference.js",
                 "Clipperz/PM/DataModel/DirectLoginInput.js",
                 "Clipperz/PM/DataModel/DirectLoginBinding.js",
                 "Clipperz/PM/DataModel/OneTimePasswordManager.js",
                 "Clipperz/PM/DataModel/OneTimePassword.js",
                 "Clipperz/YUI/IBLayoutManager.js",
                 "Clipperz/YUI/IBLayoutRegion.js",
                 "Clipperz/YUI/Drawer.js",
                 "Clipperz/YUI/Collapser.js",
                 "Clipperz/YUI/MessageBox.js",
                 "Clipperz/YUI/DomHelper.js",
 
                 "Clipperz/PM/Main.js"
         ],
 
         "css": [
                 "yui-extensions/reset-min.css",
                 "yui-extensions/core.css",
                 "yui-extensions/basic-dialog.css",
                 "yui-extensions/button.css",
                 "clipperz/clipperz.css",
                 "clipperz/compact.css",
                 "clipperz/ytheme-clipperz.css"
-        ]
+        ],
+
+        "html.template": "index_template.html"
+
 }