ca
Merge branch 'master' of https://github.com/enjayes/logistikapp.git

Conflicts:
	workspace/LogistikApp/assets/www/js/clientView.js
Merge branch 'master' of https://github.com/enjayes/logistikapp.git