db removed
db connection pool name changed
db removed
db connection pool name changed
Merge origin/master

Conflicts:
	nbproject/genfiles.properties
	nbproject/project.xml
	src/java/com/tigergrandson/lib.java