Dev oracle sherlock

See merge request root/atms!163

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

Dev oracle sherlock

See merge request root/atms!162

This reverts commit 3acb4e28.

[dev] fixed uigrid to dxgrid and view active menu

See merge request root/atms!161

areaName and businessUnitName

See merge request root/atms!160

# Conflicts:
#	atms-web/src/main/webapp/bundles/infrastructure.js