סדרטון
Merge branch 'master' of https://github.com/DavidSalzer/rothschild-kube-appliaction
lock image
קוייז וטיפיול בטקסט
Merge branch 'master' of https://github.com/DavidSalzer/rothschild-kube-appliaction

Conflicts:
	kube/platforms/ios/www/index.html
	kube/platforms/ios/www/js/generalScripts.js
	kube/platforms/ios/www/js/writeTextController.js