Done basic dialogs integration
Merge branch 'develop' into feature/dialogs

Conflicts:
	app/src/app.coffee