Signed-off-by: Buddhika <buddhik@pdhssp-ML350p.(none)>
Signed-off-by: Buddhika <buddhik@pdhssp-ML350p.(none)>
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/java/gov/health/bean/DepartmentController.java
	web/WEB-INF/glassfish-web.xml
	web/add_area_notification_form.xhtml
	web/index.xhtml
	web/resources/template/template_1.xhtml