work
Merge remote-tracking branch 'origin/master'

Conflicts:
	Resources/app.js
	Resources/settings.js