Merge branch 'master' into feature/new-splashscreen

Conflicts:
	manifest.appcache

manifest.appcache

@@ -1,33 +1,39 @@
 CACHE MANIFEST
-# 6.2.1
+# 6.3
 
+css/uhr.css
+css/uhr-black.css
+css/uhr-blue.css
+css/uhr-green.css
+css/uhr-pink.css
+css/uhr-red.css
+css/uhr-white.css
+css/uhr-yellow.css
+info/index.html
+info/info.css
+js/uhr.js
+js/uhr-de.js
+js/uhr-de_CH.js
+js/uhr-de_CH_genau.js
+js/uhr-de_CH-seconds.js
+js/uhr-en.js
+js/uhr-fr.js
+js/uhr-it.js
+lib/jquery-2.1.0.min.js
+lib/jquery-cookie-1.4.0.js
+lib/jquery-ui-1.10.4.custom.min.js
+resources/apple-touch-icon-precomposed.png
+resources/close.png
+resources/favicon.png
+resources/settings.png
+resources/uhr.woff
+showcase/index.html
 COPYING
 README.md
+VERSION
 apple-touch-icon-precomposed.png
 apple-touch-startup-image-320x460.png
 apple-touch-startup-image-640x1096.png
 apple-touch-startup-image-640x920.png
 favicon.png
 index.html
-jquery-2.1.0.min.js
-jquery-cookie-1.4.0.js
-jquery-ui-1.10.4.custom.min.js
-uhr-black.css
-uhr-blue.css
-uhr-de.js
-uhr-de_CH.js
-uhr-de_CH_genau.js
-uhr-en.js
-uhr-fr.js
-uhr-green.css
-uhr-it.js
-uhr-pink.css
-uhr-red.css
-uhr-white.css
-uhr-yellow.css
-uhr.css
-uhr.js
-uhr.woff
-info/index.html
-info/info.css
-showcase/index.html