Merge branch 'develop' into feature/ios-app

Conflicts:
	index.html

index.html

@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	<link rel="stylesheet" type="text/css" href="uhr-white.css" />
 	<link rel="shortcut icon" type="image/png" href="favicon.png" />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-	<link rel="apple-touch-icon-precomposed" href="icon.png" />
+	<link rel="apple-touch-icon-precomposed" href="apple-touch-icon-precomposed.png" />
 	<link rel="apple-touch-startup-image" href="splash.png" />
 	<meta name="apple-mobile-web-app-capable" content="yes" />
 	<meta name="apple-mobile-web-app-status-bar-style" content="black" />

manifest.appcache

@@ -3,8 +3,8 @@ CACHE MANIFEST
 
 COPYING
 README.md
+apple-touch-icon-precomposed.png
 favicon.png
-icon.png
 index.html
 jquery-2.1.0.min.js
 jquery-cookie-1.4.0.js