removing automatic alert trigger
Merge branch 'master' of github.com:4acertijos/SpaceAppsChallenge2013

Conflicts:
	website/js/emergency.js