hit
Merge branch 'master' of https://github.com/avaiyahardik/PMNRF

Conflicts:
	PMNRF/build/web/WEB-INF/classes/DAO/DBManager.class
	PMNRF/build/web/WEB-INF/classes/DAO/DBOperation.class
	PMNRF/build/web/WEB-INF/classes/pmnrf/controller/actions/AddDisasterAction.class
	PMNRF/build/web/WEB-INF/classes/pmnrf/controller/actions/CreateAuthorityAction.class
	PMNRF/build/web/WEB-INF/classes/pmnrf/controller/actions/DeleteDisasterAction.class
	PMNRF/dist/PMNRF.war
hit
hit