Alerts api coming out
Merge branch 'master' of https://github.com/mvanasse/peril

Conflicts:
	phone/Gruntfile.js