Database Branch-THis is a database fix from user2.
Merge branch 'database'

Conflicts:
	uiHelloWorld/src/com/abcd/ui/UIHelloMain.java