latest changes
Merge branch 'master' of https://github.com/msmith2119/StShell

Conflicts:
	db/DBConn.groovy