Merge branch 'dev_oracle' of http://code.tech.tax.asia.pwcinternal.com/root/atms into dev_oracle_sherlock

# Conflicts:
#	atms-dao/etc/generator-oracle/vatGeneratorConfig.xml
#	atms-invoice/pom.xml
#	atms-invoice/src/main/java/pwc/taxtech/invoice/input/InputInvoiceRepository.java
#	atms-web/src/main/webapp/bundles/app.js
#	atms-web/src/main/webapp/bundles/vat.js