Fixed routing problems
Merge branch 'master' into mhe

Conflicts:
	web/appstore/js/lbsmanual.js
	web/index.html