changing url of the dialog
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	app/public/scripts/main.min.js