- continue with file validation
- updated merge conflicts
Merge branch 'master' of https://github.com/thenhkid/universalTranslator

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