;
Merge branch 'origin/master'

Conflicts:
	kube/platforms/ios/www/js/fixedInfoController.js
Merge branch 'origin/master'
Merge branch 'origin/master'
;
Merge branch 'origin/master'

Conflicts:
	kube/platforms/ios/www/js/videoMissionController.js