Merge branch 'master' of D:\Grameen\oros with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/views/manageUser/bankDeposit.gsp
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/views/branchSetting/application.properties
work on Retailer,Country,Fiscal Year,Currency,ExchangeRate and add related js,css file for their UI design.