praveen|merging emergency registration
Banka | Fixing grunt dist for emergency registration.

Conflicts:

	Gruntfile.js
	app/emergency/index.html