s

d
Merge remote-tracking branch 'origin/master'

Conflicts:
	web-app/includes/leftMenu.jsp
Revert "s"

This reverts commit 5b451f7b5f2be42fc30cd6bb46967e51f3e30292.

Conflicts:
	web-app/includes/leftMenu.jsp
Merge branch 'master' of https://github.com/gantulgan/disasterAlert

Conflicts:
	web-app/includes/leftMenu.jsp