add alert and "add alert" page
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/app/controller/Application.js