Merge origin/master

Conflicts:
	nbproject/private/private.properties
	nbproject/project.properties
	src/conf/persistence.xml
	src/java/gov/health/bean/DbfController.java
Merge origin/master

Conflicts:
	README.md