Merge branch 'develop' into feature/new-splashscreen

Conflicts:
	manifest.appcache

manifest.appcache

@@ -1,35 +1,27 @@
 CACHE MANIFEST
-# 7.0-next
+# Version 8.0.1-dev.0
 
-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
+/
+dist/jquery.uhr.base.min.js
+dist/jquery.uhr.complete.min.js
+dist/libs.min.js
+dist/uhr.min.css
+dist/uhr-black.min.css
+dist/uhr-blue.min.css
+dist/uhr-green.min.css
+dist/uhr-pink.min.css
+dist/uhr-red.min.css
+dist/uhr-white.min.css
+dist/uhr-yellow.min.css
+info/
 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-dk.js
-js/uhr-en.js
-js/uhr-es.js
-js/uhr-fr.js
-js/uhr-it.js
-js/uhr-nl.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
-COPYING
+index.html
 README.md
 VERSION
 apple-touch-icon-precomposed.png