Final fixed before official /delta release

frontend/delta/fonts/IcoMoon/Clipperz Icon font.json

@@ -1,6 +1,36 @@
 {
 	"IcoMoonType": "selection",
 	"icons": [
+		{
+			"icon": {
+				"paths": [
+					"M752 250l186 262-186 262q-26 36-70 36h-468q-34 0-60-25t-26-59v-428q0-34 26-59t60-25h468q44 0 70 36z"
+				],
+				"attrs": [
+					{}
+				],
+				"isMulticolor": false,
+				"tags": [
+					"label"
+				],
+				"defaultCode": 58022,
+				"grid": 24
+			},
+			"attrs": [
+				{}
+			],
+			"properties": {
+				"order": 27,
+				"id": 678,
+				"prevSize": 24,
+				"code": 58022,
+				"name": "label",
+				"ligatures": "label"
+			},
+			"setIdx": 0,
+			"setId": 9,
+			"iconIdx": 678
+		},
 		{
 			"icon": {
 				"paths": [

frontend/delta/js/Clipperz/PM/DataModel/DirectLogin.js

@@ -593,6 +593,7 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
 	},
 
 	'bindFormFieldWithLabelToRecordFieldWithLabel': function (aFormFieldLabel, aRecordFieldLabel) {
+//console.log("DirectLogin.bindFormFieldWithLabelToCardFieldWithLabel", aFormFieldLabel, aRecordFieldLabel);
 		return Clipperz.Async.callbacks("DirectLogin.bindFormFieldWithLabelToCardFieldWithLabel", [
 			Clipperz.Async.collectResults("DirectLogin.bindFormFieldWithLabelToCardFieldWithLabel - collect results", {
 				'binding': [
@@ -604,7 +605,9 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
 				]
 			}),
 			function (someValues) {
-				someValues['binding'].setField(someValues['field'])
+				if (typeof(someValues['binding']) != 'undefined') {
+					someValues['binding'].setField(someValues['field']);
+				}
 			}
 		], {trace:false});
 	},
@@ -615,7 +618,15 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.DirectLogin, Object, {
 		return Clipperz.Async.callbacks("DirectLogin.setBindings", [
 			function () {
 				return MochiKit.Base.map(function (aBindingInfo) {
-					return self.bindFormFieldWithLabelToRecordFieldWithLabel(aBindingInfo[0], originalFields[aBindingInfo[1]]['label']);
+					var	result;
+					
+					try {
+						result = self.bindFormFieldWithLabelToRecordFieldWithLabel(aBindingInfo[0], originalFields[aBindingInfo[1]]['label']);
+					} catch (exception) {
+						result = MochiKit.Async.succeed();
+					}
+					
+					return result;
 				}, MochiKit.Base.zip(MochiKit.Base.keys(someBindings), MochiKit.Base.values(someBindings)));
 			},
 			Clipperz.Async.collectAll,

frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/DataImport/Input.js

@@ -226,7 +226,7 @@ Clipperz.PM.UI.Components.ExtraFeatures.DataImport.InputClass = React.createClas
 	render: function() {
 		return React.DOM.div({},[
 			React.DOM.div({'className':'description'}, [
-				React.DOM.p({}, "You can import either CSV data, or Clipperz data exported in JSON"),
+				React.DOM.p({}, "Import data from a CSV file (like those produced by most password managers) or copy data from another Clipperz account using a JSON/HTML export file created by Clipperz."),
 			]),
 			React.DOM.form({'key':'form', 'className':'importForm' }, [
 				React.DOM.input({
@@ -239,16 +239,26 @@ Clipperz.PM.UI.Components.ExtraFeatures.DataImport.InputClass = React.createClas
 				React.DOM.div({
 					'onDragOver': this.handleOnDragOver,
 					'onDrop': this.handleOnDrop,
-					'onClick': MochiKit.Base.bind(function() { this.refs['upload-input'].getDOMNode().click() }, this),
 					'className': 'dropArea'
-				}, "Drag your Clipperz export file here or click select it manually."),
+				}, [
-				React.DOM.p({}, "or"),
+					React.DOM.span({}, "Drag your CSV or Clipperz export file here"),
+					React.DOM.br({}),
+					React.DOM.span({}, "or"),
+					React.DOM.br({}),
+					React.DOM.a({
+						'className': 'button',
+						'onClick': MochiKit.Base.bind(function() { this.refs['upload-input'].getDOMNode().click() }, this),
+					}, "select it manually")
+				]),
+				React.DOM.div({'className': 'description'},
+					React.DOM.p({}, "Alternatively you may type or paste any properly formatted CSV or JSON data.")
+				),
 				React.DOM.div({'key':'fields'},[
 					React.DOM.textarea({
 						'key':'input-textarea',
 						'name':'input-textarea',
 						'ref':'input-textarea',
-						'placeholder':"Copy or type your data here",
+						'placeholder':"Type or copy your data here",
 						'value': this.state.inputString,
 						'onChange': this.handleTextareaChange,
 						'onDragOver': this.handleOnDragOver,

frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/OTP.js

@@ -147,7 +147,10 @@ Clipperz.PM.UI.Components.ExtraFeatures.OTPClass = React.createClass({
 
 	renderOtpRows: function() {
 		var result;
+		var	defaultOtpLabel;
 
+		defaultOtpLabel = "…";
+		
 		if (this.props.userInfo.otpList) {
 			result = MochiKit.Base.map(MochiKit.Base.bind(function (anOTP) {
 				var	reference = anOTP.reference();
@@ -177,11 +180,15 @@ Clipperz.PM.UI.Components.ExtraFeatures.OTPClass = React.createClass({
 					labelComponent = React.DOM.input({
 						'autoFocus':true,
 						'value':this.state.otpLabel,
+						'placeholder': "custom label",
 						'onChange':MochiKit.Base.partial(this.updateOtpLabel, anOTP),
 						'onKeyDown':MochiKit.Base.partial(this.handleKeyPressed, anOTP),
 					});
 				} else {
-					labelComponent = React.DOM.span({'onClick':MochiKit.Base.partial(this.enableOtpLabelEditing, anOTP)}, (anOTP.label()) ? anOTP.label() : "---")
+					labelComponent = React.DOM.span({
+						'onClick':MochiKit.Base.partial(this.enableOtpLabelEditing, anOTP),
+						'className': Clipperz.PM.UI.Components.classNames({'customLabel':anOTP.label()})
+					}, (anOTP.label()) ? anOTP.label() : defaultOtpLabel)
 				}
 
 				return React.DOM.li({
@@ -208,9 +215,9 @@ Clipperz.PM.UI.Components.ExtraFeatures.OTPClass = React.createClass({
 	render: function () {
 		return	React.DOM.div({'className':'extraFeature OTP'}, [
 			React.DOM.div({'className':'header'}, [
-				React.DOM.h1({}, "One Time Passwords"),
+				React.DOM.h1({}, "One-Time Passwords"),
 				React.DOM.div({'className':'description'}, [
-					React.DOM.p({}, "A one-time passphrase works like your regular passphrase, but can be used only once. This makes it expecially useful for using it in places where keyloggers may be installed."),
+					React.DOM.p({}, "A one-time password works like your regular passphrase, but can be used only once. This makes it expecially useful for using it in places where keyloggers may be installed."),
 				]),
 				React.DOM.a({'className':'button', 'onClick':this.handlePrint}, "Print")
 			]),

frontend/delta/js/Clipperz/PM/UI/Components/Pages/LoginPage.js

@@ -139,6 +139,12 @@ Clipperz.PM.UI.Components.Pages.LoginPageClass = React.createClass({
 		}
 	},
 
+	showUrl: function (anUrl) {
+		return function () {
+			window.open(anUrl, 'clipperz_about');
+		}
+	},
+
 	render: function() {
 //console.log("LOGIN PAGE", this.props);
 //		var registrationLink =	React.DOM.footer({'key':'registrationLink', 'className':'registrationLink'}, [
@@ -148,10 +154,20 @@ Clipperz.PM.UI.Components.Pages.LoginPageClass = React.createClass({
 		var	registrationLink = React.DOM.a({'key':'signup', 'className':'registrationLink', 'onClick':this.handleRegistrationLinkClick}, "Sign up");
 
 		return React.DOM.div({'key':'loginForm', 'className':'loginForm ' + this.props['style']}, [
-			React.DOM.header({'key':'header'}, 'clipperz'),
+			React.DOM.header({'key':'header'}, [
+				React.DOM.h3({}, 'clipperz'),
+				React.DOM.h5({}, 'keep it to yourself'),
+			]),
 			React.DOM.div({'key':'formWrapper', 'className':'form'}, [
 				this.props.mode == 'PIN' ? this.pinForm() : this.loginForm(),
 			]),
+			React.DOM.div({'key':'links', 'className':'links'}, [
+				React.DOM.ul({}, [
+					React.DOM.li({'key':'about',   'onClick':this.showUrl('/about/')}, "About"),
+					React.DOM.li({'key':'terms',   'onClick':this.showUrl('/terms_service/')}, "Terms of service"),
+					React.DOM.li({'key':'privacy', 'onClick':this.showUrl('/privacy_policy/')}, "Privacy"),
+				])
+			]),
 			React.DOM.footer({'key':'footer'}, [
 				this.props['isNewUserRegistrationAvailable'] ? registrationLink : null,
 				React.DOM.div({'key':'applicationVersion', 'className':'applicationVersion'}, [

frontend/delta/js/Clipperz/PM/UI/Components/Pages/RegistrationPage.js

@@ -214,6 +214,12 @@ Clipperz.PM.UI.Components.Pages.RegistrationPageClass = React.createClass({
 				]);
 	},
 
+	showUrl: function (anUrl) {
+		return function () {
+			window.open(anUrl, 'clipperz_about');
+		}
+	},
+
 	render: function () {
 		return	React.DOM.div({'className':'registrationForm'},[
 					React.DOM.header({'key':'header'}, 'clipperz'),
@@ -222,6 +228,13 @@ Clipperz.PM.UI.Components.Pages.RegistrationPageClass = React.createClass({
 							React.DOM.div({'key':'steps', 'className':'steps'}, MochiKit.Base.map(this.renderStep, this.props['steps']))
 						])
 					]),
+					React.DOM.div({'key':'links', 'className':'links'}, [
+						React.DOM.ul({}, [
+							React.DOM.li({'key':'about',   'onClick':this.showUrl('/about/')}, "About"),
+							React.DOM.li({'key':'terms',   'onClick':this.showUrl('/terms_service/')}, "Terms of service"),
+							React.DOM.li({'key':'privacy', 'onClick':this.showUrl('/privacy_policy/')}, "Privacy"),
+						])
+					]),
 					React.DOM.footer({'key':'footer'}, [
 						React.DOM.a({'key':'login', 'onClick':this.handleLoginLinkClick}, "Login")
 					])

frontend/delta/js/Clipperz/PM/UI/Components/Panels/ExtraFeaturesPanel.js

@@ -53,6 +53,7 @@ Clipperz.PM.UI.Components.Panels.ExtraFeaturesPanelClass = React.createClass({
 				'account':		false,
 				'subscription':	false,
 				'data':			false,
+				'about':		false,
 			},
 			'isFullyOpen':	false,
 			'extraFeatureComponentName': null,
@@ -73,6 +74,16 @@ Clipperz.PM.UI.Components.Panels.ExtraFeaturesPanelClass = React.createClass({
 		return (this.props['features'].indexOf(aValue) > -1);
 	},
 
+	showUrl: function (anUrl) {
+		return function () {
+			window.open(anUrl, 'clipperz_about');
+		}
+	},
+
+	logout: function () {
+		MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'logout');
+	},
+
 	//=========================================================================
 
 	toggleExtraFeatureComponent: function (aComponentName) {
@@ -141,7 +152,7 @@ Clipperz.PM.UI.Components.Panels.ExtraFeaturesPanelClass = React.createClass({
 //								])
 							]),
 							React.DOM.li({'key':'account_2', 'onClick':this.toggleExtraFeatureComponent('OTP')}, [
-								React.DOM.h2({}, "One Time Passwords"),
+								React.DOM.h2({}, "One-Time Passwords"),
 //								React.DOM.div({}, [
 //									React.DOM.p({}, "Manage your OTPs.")
 //								])
@@ -230,6 +241,41 @@ Clipperz.PM.UI.Components.Panels.ExtraFeaturesPanelClass = React.createClass({
 							])
 */
 						])
+					]),
+					React.DOM.li({'key':'about', 'className':this.state['index']['about'] ? 'open' : 'closed'}, [
+						React.DOM.h1({'key':'aboutH1', 'onClick':this.toggleIndexState('about')}, "About"),
+						React.DOM.div({'key':'address', 'className':'address'}, [
+							"Clipperz Srl",
+							"Piazza Nuova, 10",
+							"48012 Bagnacavallo",
+							"Italy"
+						]),
+						React.DOM.ul({'key':'data'}, [
+							React.DOM.li({'key':'about_1', 'className':'link', 'onClick':this.showUrl('/')}, [
+								React.DOM.h2({}, "Website"),
+							]),
+							React.DOM.li({'key':'about_2', 'className':'link', 'onClick':this.showUrl('/forum/')}, [
+								React.DOM.h2({}, "Forum"),
+							]),
+//							React.DOM.li({'key':'about_3', 'className':'link', 'onClick':this.showUrl('/blog')}, [
+//								React.DOM.h2({}, "Blog"),
+//							]),
+							React.DOM.li({'key':'about_4', 'className':'link', 'onClick':this.showUrl('https://twitter.com/clipperz')}, [
+								React.DOM.h2({}, "Twitter"),
+							]),
+							React.DOM.li({'key':'about_5', 'className':'link', 'onClick':this.showUrl('/about/contacts/')}, [
+								React.DOM.h2({}, "Contacts"),
+							]),
+							React.DOM.li({'key':'about_6', 'className':'link', 'onClick':this.showUrl('/terms_service/')}, [
+								React.DOM.h2({}, "Terms of service"),
+							]),
+							React.DOM.li({'key':'about_7', 'className':'link', 'onClick':this.showUrl('/privacy_policy/')}, [
+								React.DOM.h2({}, "Privacy"),
+							]),
+						])
+					]),
+					React.DOM.li({'key':'logout', 'className':'link', 'onClick':this.logout}, [
+						React.DOM.h2({}, "Logout")
 					])
 				])
 			]),

frontend/delta/js/Clipperz/PM/UI/ExportController.js

@@ -275,11 +275,12 @@ MochiKit.Base.update(Clipperz.PM.UI.ExportController.prototype, {
 	'saveResult': function (exportedJSON) {
 		var blob;
 		var sortedJSON;
+		var now  = new XDate();
+		var	dateString = now.toString('yyyyMMdd');
 		
 		sortedJSON = MochiKit.Iter.sorted(exportedJSON, function(a,b) { return a.label.toUpperCase().localeCompare(b.label.toUpperCase()); } );
-
 		blob = new Blob([this.renderToHtml(sortedJSON)], {type: "text/html;charset=utf-8"});
-		saveAs(blob, "clipperz_data.html");
+		saveAs(blob, dateString + '-Clipperz_Export.html');
 	},
 
 	//=============================================================================

frontend/delta/js/Clipperz/PM/UI/ImportContext.js

@@ -185,9 +185,13 @@ MochiKit.Base.update(Clipperz.PM.UI.ImportContext.prototype, {
 	},
 
 	enhanceJsonDataWithCardReferences: function (someJsonData) {
+		var now  = new XDate();
+		var	dateString = now.toString('yyyyMMdd');
+
 		return MochiKit.Base.map(function (item) {
 			item['reference'] = Clipperz.PM.Crypto.randomKey();
-			item['label'] = "COPY - " + item['label'];
+//			item['label'] = "COPY - " + item['label'];
+			item['label'] = item['label'] + ' ' + Clipperz.PM.DataModel.Record.tagChar + "Import_" + dateString;
 			return item;
 		}, someJsonData);
 	},

frontend/delta/js/Clipperz/PM/UI/MainController.js

@@ -62,6 +62,7 @@ Clipperz.PM.UI.MainController = function() {
 
 	this.registerForNotificationCenterEvents([
 		'doLogin', 'registerNewUser', 'showRegistrationForm', 'goBack',
+		'logout',
 		'changePassphrase', 'deleteAccount',
 		'updateOTPListAndDetails', 'createNewOTP', 'deleteOTPs', 'changeOTPLabel',
 //		'export',
@@ -353,6 +354,19 @@ console.log("THE BROWSER IS OFFLINE");
 		return deferredResult;
 	},
 
+	logout_handler: function () {
+		var deferredResult;
+
+		deferredResult = new Clipperz.Async.Deferred('MainController.logout', {trace:false});
+		deferredResult.addMethod(this.user(), 'logout');
+		deferredResult.addCallback(function () {
+			window.location.href = '/';
+		})
+		deferredResult.callback();
+
+		return deferredResult;
+	},
+
 	//-------------------------------------------------------------------------
 
 	registerNewUser_handler: function (credentials) {

frontend/delta/properties/creditsAndCopyrights.txt

@@ -1,632 +1,66 @@
 @clipperz.license@
 
+	==> This application is build using also the following libraries
+
+# MochiKit (http://www.mochikit.com)
+	* Repository: @mochikit.repository@ (version: @mochikit.version@ - commit: @mochikit.commit@)
+	* Copyright (c) 2005, Bob Ippolito.
+	* License: https://github.com/mochi/mochikit/blob/master/LICENSE.txt
+
+# React.js (http://facebook.github.io/react/)
+	* Repository: @reactjs.repository@ (version: @reactjs.version@ - commit: @reactjs.commit@)
+	* Copyright (c) 2013-2015, Facebook, Inc.
+	* License: https://github.com/facebook/react/blob/master/LICENSE
+
+# OnMediaQuery (https://github.com/JoshBarr/on-media-query)
+	* Repository: @onmediaquery.repository@ (version: @onmediaquery.version@ - commit: @onmediaquery.commit@)
+	* Copyright (c) 2012, Springload
+	* License: http://opensource.org/licenses/mit-license.php
+
+# mousetrap (http://craig.is/killing/mice)
+	* Repository: @mousetrap.repository@ (version: @mousetrap.version@ - commit: @mousetrap.commit@)
+	* Copyright (c) 2015, Craig Campbell
+	* License: http://www.apache.org/licenses/LICENSE-2.0
+
+# Yahoo! UI Library (http://developer.yahoo.com/yui/)
+	* Package version: 0.12
+	* Copyright (c) 2005-2006, Yahoo! Inc.
+	* License: http://developer.yahoo.com/yui/license.txt
+
+# YUI-ext (http://www.yui-ext.com)
+	* Repository: http://yui-ext.googlecode.com/svn/trunk/ (revision: 120)
+	* Copyright (c) 2006, Jack Slocum
+	* License: http://yui-ext.googlecode.com/svn/trunk/src/licence.txt
+
+# Big Integer Library v. 5.0 (http://www.leemon.com)
+	* Code downloaded on March 5, 2007 from http://www.leemon.com/crypto/BigInt.js
+	* Copyright (c) 2000-2013, Leemon Baird 
+	* License: Public Domain
+
 ===============================================================================
 
-	This application is build using also the following libraries
+	Other code snippets used in the first demo of the program, and still 
+	present just to be able to read record previously written using these same functions:
 
-# MochiKit (http://www.mochikit.com)
+# JavaScript implementation of the Secure Hash Algorithm, SHA-256 (http://anmar.eu.org/)
-	- repository: @mochikit.repository@ (version: @mochikit.version@ - commit: @mochikit.commit@)
+	* Code downloaded on March 30, 2006 from http://anmar.eu.org/projects/jssha2/files/jssha2-0.3.zip
+	* Version 0.3
+	* Copyright (c) 2003-2004, Angel Marin 
+	* License: http://opensource.org/licenses/BSD-3-Clause
+	* Notes: Some bits taken from Paul Johnston's SHA-1 implementation
 
-	* Software license: https://github.com/mochi/mochikit/blob/master/LICENSE.txt
+# Fourmilab Javascrypt
-
+	* Code downloaded on March 30, 2006 from http://www.fourmilab.ch/javascrypt/javascrypt.zip
-	|	MochiKit is dual-licensed software.  It is available under the terms of the
+	* Notes: Files used: entropy.js, aesprng.js, md5.js, aes.js, utf-8.js
-	|	MIT License, or the Academic Free License version 2.1.  The full text of
+	* Copyright (c) 2005, John Walker
-	|	each license is included below.
+	* License: http://opensource.org/licenses/mit-license.php
-	|	
-	|	The MochiKit.Style.getElementPosition function is adapted from
-	|	YAHOO.util.Dom.getXY v0.9.0. which is copyrighted by Yahoo! Inc. and
-	|	licensed under the BSD license also reproduced in full below.
-	|	
-	|	MIT License
-	|	===========
-	|	
-	|	Copyright (c) 2005 Bob Ippolito.  All rights reserved.
-	|	
-	|	Permission is hereby granted, free of charge, to any person obtaining a copy
-	|	of this software and associated documentation files (the "Software"), to deal
-	|	in the Software without restriction, including without limitation the rights
-	|	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	|	copies of the Software, and to permit persons to whom the Software is furnished
-	|	to do so, subject to the following conditions:
-	|	
-	|	The above copyright notice and this permission notice shall be included in all
-	|	copies or substantial portions of the Software.
-	|	
-	|	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	|	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-	|	FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-	|	COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-	|	IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-	|	CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-	|	
-	|	
-	|	Academic Free License v. 2.1
-	|	============================
-	|	
-	|	Copyright (c) 2005 Bob Ippolito.  All rights reserved.
-	|	
-	|	This Academic Free License (the "License") applies to any original work of
-	|	authorship (the "Original Work") whose owner (the "Licensor") has placed the
-	|	following notice immediately following the copyright notice for the Original Work:
-	|	
-	|	Licensed under the Academic Free License version 2.1
-	|	
-	|	1)	Grant of Copyright License. Licensor hereby grants You a world-wide, royalty-free,
-	|		non-exclusive, perpetual, sublicenseable license to do the following:
-	|
-	|	a) to reproduce the Original Work in copies;
-	|	b) to prepare derivative works ("Derivative Works") based upon the Original Work;
-	|	c) to distribute copies of the Original Work and Derivative Works to the public;
-	|	d) to perform the Original Work publicly; and
-	|	e) to display the Original Work publicly.
-	|	
-	|	2)	Grant of Patent License. Licensor hereby grants You a world-wide, royalty-free,
-	|		non-exclusive, perpetual, sublicenseable license, under patent claims owned or
-	|		controlled by the Licensor that are embodied in the Original Work as furnished by
-	|		the Licensor, to make, use, sell and offer for sale the Original Work and Derivative
-	|		Works.
-	|	
-	|	3)	Grant of Source Code License. The term "Source Code" means the preferred form of
-	|		the Original Work for making modifications to it and all available documentation
-	|		describing how to modify the Original Work. Licensor hereby agrees to provide a
-	|		machine-readable copy of the Source Code of the Original Work along with each copy
-	|		of the Original Work that Licensor distributes. Licensor reserves the right to satisfy
-	|		this obligation by placing a machine-readable copy of the Source Code in an information
-	|		repository reasonably calculated to permit inexpensive and convenient access by You for
-	|		as long as Licensor continues to distribute the Original Work, and by publishing the
-	|		address of that information repository in a notice immediately following the copyright
-	|		notice that applies to the Original Work.
-	|	
-	|	4)	Exclusions From License Grant. Neither the names of Licensor, nor the names of any
-	|		contributors to the Original Work, nor any of their trademarks or service marks, may
-	|		be used to endorse or promote products derived from this Original Work without express
-	|		prior written permission of the Licensor. Nothing in this License shall be deemed to
-	|		grant any rights to trademarks, copyrights, patents, trade secrets or any other
-	|		intellectual property of Licensor except as expressly stated herein. No patent license
-	|		is granted to make, use, sell or offer to sell embodiments of any patent claims other
-	|		than the licensed claims defined in Section 2. No right is granted to the trademarks
-	|		of Licensor even if such marks are included in the Original Work. Nothing in this
-	|		License shall be interpreted to prohibit Licensor from licensing under different terms
-	|		from this License any Original Work that Licensor otherwise would have a right to license.
-	|	
-	|	5)	This section intentionally omitted.
-	|	
-	|	6)	Attribution Rights. You must retain, in the Source Code of any Derivative Works that You
-	|		create, all copyright, patent or trademark notices from the Source Code of the Original
-	|		Work, as well as any notices of licensing and any descriptive text identified therein as
-	|		an "Attribution Notice." You must cause the Source Code for any Derivative Works that You
-	|		create to carry a prominent Attribution Notice reasonably calculated to inform recipients
-	|		that You have modified the Original Work.
-	|	
-	|	7)	Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright
-	|		in and to the Original Work and the patent rights granted herein by Licensor are owned
-	|		by the Licensor or are sublicensed to You under the terms of this License with the
-	|		permission of the contributor(s) of those copyrights and patent rights. Except as expressly
-	|		stated in the immediately proceeding sentence, the Original Work is provided under this
-	|		License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including,
-	|		without limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A
-	|		PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU.
-	|		This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to
-	|		Original Work is granted hereunder except under this disclaimer.
-	|	
-	|	8)	Limitation of Liability. Under no circumstances and under no legal theory, whether in tort
-	|		(including negligence), contract, or otherwise, shall the Licensor be liable to any person
-	|		for any direct, indirect, special, incidental, or consequential damages of any character
-	|		arising as a result of this License or the use of the Original Work including, without
-	|		limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction,
-	|		or any and all other commercial damages or losses. This limitation of liability shall not
-	|		apply to liability for death or personal injury resulting from Licensor's negligence to
-	|		the extent applicable law prohibits such limitation. Some jurisdictions do not allow the
-	|		exclusion or limitation of incidental or consequential damages, so this exclusion and
-	|		limitation may not apply to You.
-	|	
-	|	9)	Acceptance and Termination. If You distribute copies of the Original Work or a Derivative
-	|		Work, You must make a reasonable effort under the circumstances to obtain the express
-	|		assent of recipients to the terms of this License. Nothing else but this License (or
-	|		another written agreement between Licensor and You) grants You permission to create
-	|		Derivative Works based upon the Original Work or to exercise any of the rights granted in
-	|		Section 1 herein, and any attempt to do so except under the terms of this License (or
-	|		another written agreement between Licensor and You) is expressly prohibited by U.S. copyright
-	|		law, the equivalent laws of other countries, and by international treaty. Therefore, by
-	|		exercising any of the rights granted to You in Section 1 herein, You indicate Your
-	|		acceptance of this License and all of its terms and conditions.
-	|	
-	|	10)	Termination for Patent Action. This License shall terminate automatically and You may no
-	|		longer exercise any of the rights granted to You by this License as of the date You
-	|		commence an action, including a cross-claim or counterclaim, against Licensor or any
-	|		licensee alleging that the Original Work infringes a patent. This termination provision
-	|		shall not apply for an action alleging patent infringement by combinations of the Original
-	|		Work with other software or hardware.
-	|	
-	|	11)	Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be
-	|		brought only in the courts of a jurisdiction wherein the Licensor resides or in which
-	|		Licensor conducts its primary business, and under the laws of that jurisdiction excluding
-	|		its conflict-of-law provisions. The application of the United Nations Convention on Contracts
-	|		for the International Sale of Goods is expressly excluded. Any use of the Original Work
-	|		outside the scope of this License or after its termination shall be subject to the
-	|		requirements and penalties of the U.S. Copyright Act, 17 U.S.C. § 101 et seq., the equivalent
-	|		laws of other countries, and international treaty. This section shall survive the termination
-	|		of this License.
-	|	
-	|	12)	Attorneys Fees. In any action to enforce the terms of this License or seeking damages
-	|		relating thereto, the prevailing party shall be entitled to recover its costs and expenses,
-	|		including, without limitation, reasonable attorneys' fees and costs incurred in connection
-	|		with such action, including any appeal of such action. This section shall survive the
-	|		termination of this License.
-	|	
-	|	13)	Miscellaneous. This License represents the complete agreement concerning the subject matter
-	|		hereof. If any provision of this License is held to be unenforceable, such provision shall
-	|		be reformed only to the extent necessary to make it enforceable.
-	|	
-	|	14)	Definition of "You" in This License. "You" throughout this License, whether in upper or lower
-	|		case, means an individual or a legal entity exercising rights under, and complying with all
-	|		of the terms of, this License. For legal entities, "You" includes any entity that controls,
-	|		is controlled by, or is under common control with you. For purposes of this definition,
-	|		"control" means (i) the power, direct or indirect, to cause the direction or management of
-	|		such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or
-	|		more of the outstanding shares, or (iii) beneficial ownership of such entity.
-	|	
-	|	15)	Right to Use. You may use the Original Work in all ways not otherwise restricted or
-	|		conditioned by this License or by law, and Licensor promises not to interfere with or be
-	|		responsible for such uses by You.
-	|	
-	|	This license is Copyright (C) 2003-2004 Lawrence E. Rosen. All rights reserved. Permission is
-	|	hereby granted to copy and distribute this license without modification. This license may not
-	|	be modified without the express written permission of its copyright owner.
-	|	
-	|	
-	|	BSD License
-	|	===========
-	|	
-	|	Copyright (c) 2006, Yahoo! Inc.
-	|	All rights reserved.
-	|	
-	|	Redistribution and use of this software in source and binary forms, with or without modification,
-	|	are permitted provided that the following conditions are met:
-	|	
-	|	    *	Redistributions of source code must retain the above copyright notice, this list of
-	|			conditions and the following disclaimer.
-	|	    *	Redistributions in binary form must reproduce the above copyright notice, this list of
-	|			conditions and the following disclaimer in the documentation and/or other materials provided
-	|			with the distribution.
-	|	    *	Neither the name of Yahoo! Inc. nor the names of its contributors may be used to endorse or
-	|			promote products derived from this software without specific prior written permission of
-	|			Yahoo! Inc.
-	|	
-	|	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-	|	WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-	|	PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-	|	ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-	|	LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	|	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-	|	TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-	|	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-# React.js (http://facebook.github.io/react/)
-	- repository: @reactjs.repository@ (version: @reactjs.version@ - commit: @reactjs.commit@)
-
-	* Software license: https://github.com/facebook/react/blob/master/LICENSE
-
-	|	                              Apache License
-	|	                        Version 2.0, January 2004
-	|	                     http://www.apache.org/licenses/
-	|
-	|	TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-	|
-	|	1. Definitions.
-	|
-	|	   "License" shall mean the terms and conditions for use, reproduction,
-	|	   and distribution as defined by Sections 1 through 9 of this document.
-	|
-	|	   "Licensor" shall mean the copyright owner or entity authorized by
-	|	   the copyright owner that is granting the License.
-	|
-	|	   "Legal Entity" shall mean the union of the acting entity and all
-	|	   other entities that control, are controlled by, or are under common
-	|	   control with that entity. For the purposes of this definition,
-	|	   "control" means (i) the power, direct or indirect, to cause the
-	|	   direction or management of such entity, whether by contract or
-	|	   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-	|	   outstanding shares, or (iii) beneficial ownership of such entity.
-	|
-	|	   "You" (or "Your") shall mean an individual or Legal Entity
-	|	   exercising permissions granted by this License.
-	|
-	|	   "Source" form shall mean the preferred form for making modifications,
-	|	   including but not limited to software source code, documentation
-	|	   source, and configuration files.
-	|
-	|	   "Object" form shall mean any form resulting from mechanical
-	|	   transformation or translation of a Source form, including but
-	|	   not limited to compiled object code, generated documentation,
-	|	   and conversions to other media types.
-	|
-	|	   "Work" shall mean the work of authorship, whether in Source or
-	|	   Object form, made available under the License, as indicated by a
-	|	   copyright notice that is included in or attached to the work
-	|	   (an example is provided in the Appendix below).
-	|
-	|	   "Derivative Works" shall mean any work, whether in Source or Object
-	|	   form, that is based on (or derived from) the Work and for which the
-	|	   editorial revisions, annotations, elaborations, or other modifications
-	|	   represent, as a whole, an original work of authorship. For the purposes
-	|	   of this License, Derivative Works shall not include works that remain
-	|	   separable from, or merely link (or bind by name) to the interfaces of,
-	|	   the Work and Derivative Works thereof.
-	|
-	|	   "Contribution" shall mean any work of authorship, including
-	|	   the original version of the Work and any modifications or additions
-	|	   to that Work or Derivative Works thereof, that is intentionally
-	|	   submitted to Licensor for inclusion in the Work by the copyright owner
-	|	   or by an individual or Legal Entity authorized to submit on behalf of
-	|	   the copyright owner. For the purposes of this definition, "submitted"
-	|	   means any form of electronic, verbal, or written communication sent
-	|	   to the Licensor or its representatives, including but not limited to
-	|	   communication on electronic mailing lists, source code control systems,
-	|	   and issue tracking systems that are managed by, or on behalf of, the
-	|	   Licensor for the purpose of discussing and improving the Work, but
-	|	   excluding communication that is conspicuously marked or otherwise
-	|	   designated in writing by the copyright owner as "Not a Contribution."
-	|
-	|	   "Contributor" shall mean Licensor and any individual or Legal Entity
-	|	   on behalf of whom a Contribution has been received by Licensor and
-	|	   subsequently incorporated within the Work.
-	|
-	|	2. Grant of Copyright License. Subject to the terms and conditions of
-	|	   this License, each Contributor hereby grants to You a perpetual,
-	|	   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-	|	   copyright license to reproduce, prepare Derivative Works of,
-	|	   publicly display, publicly perform, sublicense, and distribute the
-	|	   Work and such Derivative Works in Source or Object form.
-	|
-	|	3. Grant of Patent License. Subject to the terms and conditions of
-	|	   this License, each Contributor hereby grants to You a perpetual,
-	|	   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-	|	   (except as stated in this section) patent license to make, have made,
-	|	   use, offer to sell, sell, import, and otherwise transfer the Work,
-	|	   where such license applies only to those patent claims licensable
-	|	   by such Contributor that are necessarily infringed by their
-	|	   Contribution(s) alone or by combination of their Contribution(s)
-	|	   with the Work to which such Contribution(s) was submitted. If You
-	|	   institute patent litigation against any entity (including a
-	|	   cross-claim or counterclaim in a lawsuit) alleging that the Work
-	|	   or a Contribution incorporated within the Work constitutes direct
-	|	   or contributory patent infringement, then any patent licenses
-	|	   granted to You under this License for that Work shall terminate
-	|	   as of the date such litigation is filed.
-	|
-	|	4. Redistribution. You may reproduce and distribute copies of the
-	|	   Work or Derivative Works thereof in any medium, with or without
-	|	   modifications, and in Source or Object form, provided that You
-	|	   meet the following conditions:
-	|
-	|	   (a) You must give any other recipients of the Work or
-	|	       Derivative Works a copy of this License; and
-	|
-	|	   (b) You must cause any modified files to carry prominent notices
-	|	       stating that You changed the files; and
-	|
-	|	   (c) You must retain, in the Source form of any Derivative Works
-	|	       that You distribute, all copyright, patent, trademark, and
-	|	       attribution notices from the Source form of the Work,
-	|	       excluding those notices that do not pertain to any part of
-	|	       the Derivative Works; and
-	|
-	|	   (d) If the Work includes a "NOTICE" text file as part of its
-	|	       distribution, then any Derivative Works that You distribute must
-	|	       include a readable copy of the attribution notices contained
-	|	       within such NOTICE file, excluding those notices that do not
-	|	       pertain to any part of the Derivative Works, in at least one
-	|	       of the following places: within a NOTICE text file distributed
-	|	       as part of the Derivative Works; within the Source form or
-	|	       documentation, if provided along with the Derivative Works; or,
-	|	       within a display generated by the Derivative Works, if and
-	|	       wherever such third-party notices normally appear. The contents
-	|	       of the NOTICE file are for informational purposes only and
-	|	       do not modify the License. You may add Your own attribution
-	|	       notices within Derivative Works that You distribute, alongside
-	|	       or as an addendum to the NOTICE text from the Work, provided
-	|	       that such additional attribution notices cannot be construed
-	|	       as modifying the License.
-	|
-	|	   You may add Your own copyright statement to Your modifications and
-	|	   may provide additional or different license terms and conditions
-	|	   for use, reproduction, or distribution of Your modifications, or
-	|	   for any such Derivative Works as a whole, provided Your use,
-	|	   reproduction, and distribution of the Work otherwise complies with
-	|	   the conditions stated in this License.
-	|
-	|	5. Submission of Contributions. Unless You explicitly state otherwise,
-	|	   any Contribution intentionally submitted for inclusion in the Work
-	|	   by You to the Licensor shall be under the terms and conditions of
-	|	   this License, without any additional terms or conditions.
-	|	   Notwithstanding the above, nothing herein shall supersede or modify
-	|	   the terms of any separate license agreement you may have executed
-	|	   with Licensor regarding such Contributions.
-	|
-	|	6. Trademarks. This License does not grant permission to use the trade
-	|	   names, trademarks, service marks, or product names of the Licensor,
-	|	   except as required for reasonable and customary use in describing the
-	|	   origin of the Work and reproducing the content of the NOTICE file.
-	|
-	|	7. Disclaimer of Warranty. Unless required by applicable law or
-	|	   agreed to in writing, Licensor provides the Work (and each
-	|	   Contributor provides its Contributions) on an "AS IS" BASIS,
-	|	   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-	|	   implied, including, without limitation, any warranties or conditions
-	|	   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-	|	   PARTICULAR PURPOSE. You are solely responsible for determining the
-	|	   appropriateness of using or redistributing the Work and assume any
-	|	   risks associated with Your exercise of permissions under this License.
-	|
-	|	8. Limitation of Liability. In no event and under no legal theory,
-	|	   whether in tort (including negligence), contract, or otherwise,
-	|	   unless required by applicable law (such as deliberate and grossly
-	|	   negligent acts) or agreed to in writing, shall any Contributor be
-	|	   liable to You for damages, including any direct, indirect, special,
-	|	   incidental, or consequential damages of any character arising as a
-	|	   result of this License or out of the use or inability to use the
-	|	   Work (including but not limited to damages for loss of goodwill,
-	|	   work stoppage, computer failure or malfunction, or any and all
-	|	   other commercial damages or losses), even if such Contributor
-	|	   has been advised of the possibility of such damages.
-	|
-	|	9. Accepting Warranty or Additional Liability. While redistributing
-	|	   the Work or Derivative Works thereof, You may choose to offer,
-	|	   and charge a fee for, acceptance of support, warranty, indemnity,
-	|	   or other liability obligations and/or rights consistent with this
-	|	   License. However, in accepting such obligations, You may act only
-	|	   on Your own behalf and on Your sole responsibility, not on behalf
-	|	   of any other Contributor, and only if You agree to indemnify,
-	|	   defend, and hold each Contributor harmless for any liability
-	|	   incurred by, or claims asserted against, such Contributor by reason
-	|	   of your accepting any such warranty or additional liability.
-	|
-	|	END OF TERMS AND CONDITIONS
-	|
-	|	APPENDIX: How to apply the Apache License to your work.
-	|
-	|	   To apply the Apache License to your work, attach the following
-	|	   boilerplate notice, with the fields enclosed by brackets "[]"
-	|	   replaced with your own identifying information. (Don't include
-	|	   the brackets!)  The text should be enclosed in the appropriate
-	|	   comment syntax for the file format. We also recommend that a
-	|	   file or class name and description of purpose be included on the
-	|	   same "printed page" as the copyright notice for easier
-	|	   identification within third-party archives.
-	|
-	|	Copyright [yyyy] [name of copyright owner]
-	|
-	|	Licensed under the Apache License, Version 2.0 (the "License");
-	|	you may not use this file except in compliance with the License.
-	|	You may obtain a copy of the License at
-	|
-	|	    http://www.apache.org/licenses/LICENSE-2.0
-	|
-	|	Unless required by applicable law or agreed to in writing, software
-	|	distributed under the License is distributed on an "AS IS" BASIS,
-	|	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	|	See the License for the specific language governing permissions and
-	|	limitations under the License.
-
-
-
-# Modernizr (http://modernizr.com)
-	- repository: @modernizr.repository@ (version: @modernizr.version@ - commit: @modernizr.commit@)
-
-	* Software license: http://modernizr.com/license/
-
-	|	Copyright (c) 2009–2013
-	|	Permission is hereby granted, free of charge, to any person obtaining a copy
-	|	of this software and associated documentation files (the "Software"), to deal
-	|	in the Software without restriction, including without limitation the rights
-	|	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	|	copies of the Software, and to permit persons to whom the Software is
-	|	furnished to do so, subject to the following conditions:
-	|	The above copyright notice and this permission notice shall be included in
-	|	all copies or substantial portions of the Software.
-	|	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	|	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	|	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	|	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	|	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	|	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	|	THE SOFTWARE.
-
-
-# OnMediaQuery (https://github.com/JoshBarr/on-media-query)
-	- repository: @onmediaquery.repository@ (version: @onmediaquery.version@ - commit: @onmediaquery.commit@)
-
-	* Software license: http://opensource.org/licenses/mit-license.php
-
-	|	The MIT License (MIT)
-	|	
-	|	Copyright (c) <year> <copyright holders>
-	|	
-	|	Permission is hereby granted, free of charge, to any person obtaining a copy
-	|	of this software and associated documentation files (the "Software"), to deal
-	|	in the Software without restriction, including without limitation the rights
-	|	to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-	|	copies of the Software, and to permit persons to whom the Software is
-	|	furnished to do so, subject to the following conditions:
-	|	
-	|	The above copyright notice and this permission notice shall be included in
-	|	all copies or substantial portions of the Software.
-	|	
-	|	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	|	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	|	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-	|	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	|	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	|	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	|	THE SOFTWARE.
-
-
-# mousetrap (http://craig.is/killing/mice)
-	- repository: @mousetrap.repository@ (version: @mousetrap.version@ - commit: @mousetrap.commit@)
-
-	* Software license: https://github.com/ccampbell/mousetrap
-
-	|	[…]
-	|
-	|	It is licensed under the Apache 2.0 license.
-	|
-	|	[…]
-
-
-# Add to Home Screen (http://cubiq.org/add-to-home-screen)
-	- repository: @addtohomescreen.repository@ (version: @addtohomescreen.version@ - commit: @addtohomescreen.commit@)
-
-	* Software license: https://github.com/facebook/react/blob/master/LICENSE
-
-	|	This software is released under the MIT License.
-	|	
-	|	Copyright (c) 2013 Matteo Spinelli, http://cubiq.org/
-	|	
-	|	Permission is hereby granted, free of charge, to any person obtaining
-	|	a copy of this software and associated documentation files (the "Software"),
-	|	to deal in the Software without restriction, including without limitation
-	|	the rights to use, copy, modify, merge, publish, distribute, sublicense,
-	|	and/or sell copies of the Software, and to permit persons to whom the Software
-	|	is furnished to do so, subject to the following conditions:
-	|	
-	|	The above copyright notice and this permission notice shall be included in
-	|	all copies or substantial portions of the Software.
-	|	
-	|	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-	|	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-	|	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-	|	THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-	|	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-	|	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-	|	THE SOFTWARE.
-
-
-
-# Yahoo! UI Library (http://developer.yahoo.com/yui/)
-	- package version: 0.12
-	
-	Copyright © 2005-2006 Yahoo! Inc. All rights reserved
-	* Copyright notes:  http://docs.yahoo.com/info/copyright/copyright.html
-	* Software license: http://developer.yahoo.com/yui/license.txt
-
-	|	Software License Agreement (BSD License)
-	|
-	|	Copyright (c) 2006, Yahoo! Inc.
-	|	All rights reserved.
-	|
-	|	Redistribution and use of this software in source and binary forms, with or without modification, are
-	|	permitted provided that the following conditions are met:
-	|
-	|	* Redistributions of source code must retain the above
-	|	  copyright notice, this list of conditions and the
-	|	  following disclaimer.
-	|
-	|	* Redistributions in binary form must reproduce the above
-	|	  copyright notice, this list of conditions and the
-	|	  following disclaimer in the documentation and/or other
-	|	  materials provided with the distribution.
-	|
-	|	* Neither the name of Yahoo! Inc. nor the names of its
-	|	  contributors may be used to endorse or promote products
-	|	  derived from this software without specific prior
-	|	  written permission of Yahoo! Inc.
-	|
-	|	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-	|	WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-	|	PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-	|	ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-	|	LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-	|	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-	|	TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-	|	ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-# YUI-ext (http://www.yui-ext.com)
-	- repository: http://yui-ext.googlecode.com/svn/trunk/ (revision: 120)
-
-	* Software license: http://yui-ext.googlecode.com/svn/trunk/src/licence.txt
-
-	|	yui-ext
-	|	Copyright (c) 2006, Jack Slocum
-	|	All rights reserved.
-	|
-	|	Redistribution and use in source and binary forms, with or without modification, 
-	|	are permitted provided that the following conditions are met:
-	|
-	|	    * Redistributions of source code must retain the above copyright notice, 
-	|	    this list of conditions and the following disclaimer.
-	|	    * Redistributions in binary form must reproduce the above copyright notice, 
-	|	    this list of conditions and the following disclaimer in the documentation 
-	|	    and/or other materials provided with the distribution.
-	|	    * Neither the name yui-ext nor the names of its contributors 
-	|	    may be used to endorse or promote products derived from this software 
-	|	    without specific prior written permission.
-	|
-	|	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND 
-	|	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
-	|	WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 
-	|	IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 
-	|	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
-	|	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-	|	DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 
-	|	OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-	|	NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 
-	|	EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-
-# Big Integer Library v. 5.0
-	- code downloaded on March 5, 2007 from http://www.leemon.com/crypto/BigInt.js
-
-	|	Big Integer Library v. 5.0
-	|	Created 2000, last modified 2006
-	|	Leemon Baird
-	|	www.leemon.com
-	|	
-	|	This file is public domain.   You can use it for any purpose without restriction.
-	|	I do not guarantee that it is correct, so use it at your own risk.  If you use 
-	|	it for something interesting, I'd appreciate hearing about it.  If you find 
-	|	any bugs or make any improvements, I'd appreciate hearing about those too.
-	|	It would also be nice if my name and address were left in the comments.
-	|	But none of that is required.
-
-
-
-# Other code snippets used in the first demo of the program, and still present just to be able to
-  read record previously written using these same functions:
-
-	- Code downloaded on March 30, 2006 from http://anmar.eu.org/projects/jssha2/files/jssha2-0.3.zip
-		File used: jsSha2/sha256.js
-	
-		|	A JavaScript implementation of the Secure Hash Algorithm, SHA-256
-		|	Version 0.3 Copyright Angel Marin 2003-2004 - http://anmar.eu.org/
-		|	Distributed under the BSD License
-		|	Some bits taken from Paul Johnston's SHA-1 implementation
-
-
-	- Code downloaded on March 30, 2006 from http://www.fourmilab.ch/javascrypt/javascrypt.zip
-		Files used: entropy.js, aesprng.js, md5.js, aes.js, utf-8.js
 		
+# JavaScript implementation of MD5 by Paul Johnston (http://pajhome.org.uk/crypt/md5)
+	* Code downloaded on April 26, 2006 from http://pajhome.org.uk/crypt/md5/md5.js
+	* Copyright (C) 1999 - 2002, Paul Johnston
+	* Version 2.1
+	* Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+	* License: http://opensource.org/licenses/BSD-3-Clause
 
-	- Code downloaded on April 26, 2006 from http://pajhome.org.uk/crypt/md5/md5.js
+===============================================================================
-
-		|	A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
-		|	Digest Algorithm, as defined in RFC 1321.
-		|	Version 2.1 Copyright (C) Paul Johnston 1999 - 2002.
-		|	Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
-		|	Distributed under the BSD License
-		|	See http://pajhome.org.uk/crypt/md5 for more info.
-
-
-
-#	General notes
-	The code in this page has been processed with a JavaScript compressor and is thus
-	difficult to read.
-	To get the exact version of the code used to build this application you
-	can take a look here:
-	- http://www.clipperz.com/security_privacy/security_code_review
 

frontend/delta/scss/core/layout.scss

@@ -173,6 +173,12 @@ input[type=text] {
 				width: 0px;
 			}
 		}
+
+		.extraFeatureContent {
+			.extraFeature {
+				height: calc(100% - 50px);
+			}
+		}
 		
 	}
 }

frontend/delta/scss/style/loginPage.scss

@@ -36,11 +36,22 @@ refer to http://www.clipperz.com.
 
 		header {
 			@include flex(1);
-			@include icon-font();
+//			@include icon-font();
 
 			font-size: 48pt;
 			line-height: 90pt;
 			color: $main-alternate-text-color;
+			
+			h3 {
+				font-weight: bold;
+				font-size: 38pt;
+				line-height: 1.7em;
+			}
+			
+			h5 {
+				font-size: 16pt;
+				line-height: 1.0em;
+			}
 		}
 
 		div.form {
@@ -122,6 +133,13 @@ refer to http://www.clipperz.com.
 			}
 		}
 
+		div.links {
+			ul {
+				li {
+					display: inline-block;
+				}
+			}
+		}
 
 		footer {
 			@include flex(1);
@@ -213,4 +231,25 @@ refer to http://www.clipperz.com.
 		}
 	}
 
+}
+
+.links {
+	ul {
+		li {
+			color: white;
+			cursor: pointer;
+			
+			&:after {
+				content: '-';
+				padding-left: 4px;
+				padding-right: 4px;
+			};
+
+			&:last-child:after {
+				content: '';
+				padding-left: 0px;
+				padding-right: 0px;
+			}
+		}
+	}
 }

frontend/delta/scss/style/settingsPanel.scss

@@ -48,6 +48,12 @@ refer to http://www.clipperz.com.
 //				padding: 10px;
 //				padding-right: 0px;
 				border-bottom: 1px solid white;
+				
+				&.link {
+					border-bottom: 0px;
+					padding: 10px;
+					cursor: pointer;
+				}
 
 				& > h1 {
 					cursor: pointer;
@@ -67,6 +73,12 @@ refer to http://www.clipperz.com.
 					display: none;
 					visibility: hidden;
 				}
+				
+				&.closed {
+					.address {
+						display: none;
+					}
+				}
 			}
 
 			ul {
@@ -89,7 +101,7 @@ refer to http://www.clipperz.com.
 						
 						&.offlineCopy {
 							cursor: default;
-					}
+						}
 					}
 
 					&.open {
@@ -122,6 +134,17 @@ refer to http://www.clipperz.com.
 						padding-bottom: 5px;
 						line-height: 1.2em;
 					}
+
+					.address {
+						padding-bottom: 10px;
+
+						span {
+							display: block;
+							font-size: 12pt;
+							padding-left: 14pt;
+							line-height: 1.3em;
+						}
+					}
 				
 					a.button {
 						@include border-radius(2);
@@ -142,6 +165,18 @@ refer to http://www.clipperz.com.
 							};
 						}
 					}
+					
+					&.link {
+						
+						h2 {
+						 	&:after {
+								@include icon-font();
+								content: "url";
+								padding-left: 4px;
+								color: gray;
+							}
+						};
+					}
 				}
 			}
 		}
@@ -222,6 +257,10 @@ refer to http://www.clipperz.com.
 						@include flex(auto);
 					}
 
+					input[type="checkbox"] {
+						flex-grow: 0;
+					}
+
 					label {
 						@include flex(auto);
 						font-size: 12pt;
@@ -333,7 +372,7 @@ refer to http://www.clipperz.com.
 			}
 
 			.actions {
-				padding-left: 9px;
+				padding-left: 6px;
 				padding-top: 6px;
 
 				a {
@@ -403,17 +442,40 @@ refer to http://www.clipperz.com.
 						}
 
 						.otpLabel {
-							
+							@include flexbox;
-							span {
+							@include flex-direction(row);
-								font-size: 12pt;
+							margin-right: 5px;
+
+							&:before {
+								@include flex(none);
+								content: 'label';
+								@include icon-font();
+								font-style: normal;
+								padding-right: 4px;
 								color: gray;
+								line-height: 20pt;
+//								display: inline-block;
+							};
+
+							span {
+								@include flex(auto);
+								font-size: 12pt;
+								color: #333;
 								padding: 4px 0px 4px 0px;
 								line-height: 1.3em;
 								cursor:pointer;
-								display: block;
+//								display: inline-block;
+								font-style: italic;
+								
+								&.customLabel {
+									color: gray;
+									font-style: normal;
+								}
 							}
 
+
 							input {
+								@include flex(auto);
 								font-size: 12pt;
 								color: gray;
 								width: 100%;
@@ -423,6 +485,13 @@ refer to http://www.clipperz.com.
 								margin: 0px;
 								margin-bottom: 1px;
 								background-color: #333;
+								
+								@include placeholder {
+									font-style: italic;
+									color: #444;
+								}
+								
+//								display: inline-block;
 							}
 //							.undefinedLabel {
 //								color: gray;
@@ -512,6 +581,7 @@ refer to http://www.clipperz.com.
 							
 							p {
 								width: 100%;
+								margin: 0;
 							}
 						}
 
@@ -521,9 +591,18 @@ refer to http://www.clipperz.com.
 								text-align: center;
 								height: inherit;
 								line-height: 2em;
+								padding: 1em 0;
+								margin-bottom: .5em;
 				
 								border: 3px dashed white;
 								background: black;
+
+								.button {
+									margin: .5em 0;
+									padding: 0px 14px;
+
+									font-size: 12pt;
+							}
 							}
 
 							p {

properties/license.txt

@@ -1,22 +1,32 @@
-	GNU AFFERO GENERAL PUBLIC LICENSE
+GNU AFFERO GENERAL PUBLIC LICENSE
 
 Copyright 2008-2015 Clipperz Srl
 
-This file is part of Clipperz's Password Manager web application.
+This file is part of Clipperz, a web application for encrypting texts and 
-<TODO: add description>
+documents, store them in the cloud, share them securely. 
-For further information about its features and functionalities please
+Built on web cryptography and powered by blockchain technology. 
-refer to http://www.clipperz.com
 
-* Clipperz's Password Manager is free software: you can redistribute
+For further information about Clipperz: https://clipperz.is
-  it and/or modify it under the terms of the GNU Affero General Public
-  License as published by the Free Software Foundation, either version
-  3 of the License, or (at your option) any later version.
 
-* Clipperz's Password Manager is distributed in the hope that it will
+#	Clipperz is free software: you can redistribute it and/or modify it under
-  be useful, but WITHOUT ANY WARRANTY; without even the implied
+	the terms of the GNU AFFERO GENERAL PUBLIC LICENSE as published by the Free 
-  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+	Software Foundation, either version 3 of the License, or (at your option) any
-  See the GNU Affero General Public License for more details.
+	later version.
 
-* You should have received a copy of the GNU Affero General Public
+#	Clipperz is distributed in the hope that it will be useful, but WITHOUT ANY 
-  License along with Javascript Crypto Library.  If not, see
+	WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR 
-  <http://www.gnu.org/licenses/>.
+	A PARTICULAR PURPOSE. See the Affero GNU General Public License for more 
+	details.
+
+#	You should have received a copy of the GNU Affero General Public License 
+	along with Clipperz. If not, see <http://www.gnu.org/licenses/>.
+
+===============================================================================
+
+#	PLEASE NOTE
+	The code in this page has been processed with a JavaScript compressor and is 
+	thus difficult to read. To get the exact version of the code used to build 
+	this application refer to this page:
+	<https://clipperz.is/security_privacy/security_code_review/>
+
+===============================================================================