bugfix branch
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	mobile/index.html
	mobile/static/js/lib/config.js
bugfix branch