Merge branch 'master' into develop

Conflicts:
	release-notes.md

README.md

@@ -7,7 +7,7 @@ The app can run either in browser, or as a desktop app.
 
 # Quick Links
 
-Apps: [Web](https://antelle.github.io/keeweb/) [Desktop](https://github.com/antelle/keeweb/releases/latest)  
+Apps: [Web](https://app.keeweb.info/) [Desktop](https://github.com/antelle/keeweb/releases/latest)  
 Timeline: [Release Notes](release-notes.md) [TODO](https://github.com/antelle/keeweb/wiki/TODO)  
 On one page: [Features](https://keeweb.info/#features) [FAQ](https://github.com/antelle/keeweb/wiki/FAQ)  
 Website: [keeweb.info](https://keeweb.info)  

app/scripts/comp/dropbox-link.js

@@ -20,7 +20,8 @@ var DropboxCustomErrors = {
 
 function isValidKey() {
     var isSelfHostedApp = !/^http(s?):\/\/localhost:8085/.test(location.href) &&
-        !/http(s?):\/\/antelle\.github\.io\/keeweb/.test(location.href);
+        !/http(s?):\/\/antelle\.github\.io\/keeweb/.test(location.href) &&
+        !/http(s?):\/\/app\.keeweb\.info/.test(location.href);
     return Launcher || !isSelfHostedApp || DropboxKeys.AppFolder !== DropboxKeys.AppFolderKeyParts.join('');
 }
 

app/scripts/const/links.js

@@ -3,7 +3,7 @@
 var Links = {
     Repo: 'https://github.com/antelle/keeweb',
     Desktop: 'https://github.com/antelle/keeweb/releases/latest',
-    WebApp: 'https://antelle.github.io/keeweb/',
+    WebApp: 'https://app.keeweb.info/',
     License: 'https://github.com/antelle/keeweb/blob/master/MIT-LICENSE.txt',
     UpdateDesktop: 'https://github.com/antelle/keeweb/releases/download/v{ver}/UpdateDesktop.zip',
     ReleaseNotes: 'https://github.com/antelle/keeweb/blob/master/release-notes.md#release-notes',

electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "KeeWeb",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "KeePass web app",
   "main": "main.js",
   "repository": "https://github.com/antelle/keeweb",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "keeweb",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "KeePass web app",
   "main": "Gruntfile.js",
   "repository": "https://github.com/antelle/keeweb",

release-notes.md

@@ -6,6 +6,9 @@ Performance, stability and quality improvements
 `-` #80: prevent data loss on group move  
 `-` issues with clipboard clear fixed  
 
+##### v0.6.1 (2016-02-02)
+App moved to app.keeweb.info  
+
 ##### v0.6.0 (2016-01-19)
 Improvements  
 `+` advanced search