Merge origin/master

Conflicts:
	nbproject/project.properties
	setup/glassfish-resources.xml
	src/java/gov/sp/health/bean/FormDataentryController.java