1.5, bugfixes
Merge branch 'master' of https://github.com/smapps/Apps4Life

Conflicts:
	www/config.xml
Fixes