-clean up
Merge branch 'master' of https://github.com/thenhkid/universalTranslator

Conflicts:
	dbUpdates.txt
	src/main/java/com/ut/dph/service/impl/transactionInManagerImpl.java