final
Merge branch 'master' of https://github.com/DavidSalzer/rothschild-kube-appliaction

Conflicts:
	kube/platforms/ios/www/css/style.css
	kube/platforms/ios/www/index.html
	kube/platforms/ios/www/js/admin.js
	kube/platforms/ios/www/js/navigation.js
	kube/platforms/ios/www/js/serverTemp.js