1
Merge branch 'master' of https://github.com/nxycdl/myotrs-app

Conflicts:
	www/index.html
	www/js/app.js
	www/js/authService.js

:q