# Conflicts:
#	atms-web/src/main/webapp/app/common/controls/vat-report-sheet/vat-report-sheet.js
#	atms-web/src/main/webapp/bundles/common.js