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

Conflicts:
	kube/platforms/ios/www/js/captureController.js
Merge branch 'master' of https://github.com/DavidSalzer/rothschild-kube-appliaction