Signed-off-by: thamararangana <mpnew2@gmail.com>
Merge branch 'master' of https://github.com/pdhssp/phgis.git

Conflicts:
	src/java/gov/sp/health/bean/FormDataentryController.java
	src/java/gov/sp/health/bean/WebUserController.java

Signed-off-by: thamararangana <mpnew2@gmail.com>