organized imports
changed the DB user
Merge branch 'master' of
https://github.com/harishgupta111/TravelAgent.git

Conflicts:
	src/main/resources/applicationContext.xml