Merge origin/master
Merge origin/master
Merge origin/master
Merge origin/master
merge commit
Merge origin/master
Merge https://github.com/rmage/gnvc-ims

Conflicts:
	.gitignore
	nbproject/project.properties
	src/java/dao-beans.xml