no message
logoff on homepage.
no message
no message
no message
Merge branch 'develop'

Conflicts:
	www/config.xml
	www/js/app.js
	www/js/index.js