Bug fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/ui/js/app.js
Bug fix