add a confirm dialog template
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/app/scripts/app.js