ca server
Merge remote-tracking branch 'origin/master'

Conflicts:
	workspace/LogistikApp/assets/www/js/misc.js