Merge branch 'payment' into development

Conflicts:
	app/src/main/webapp/coffee/controller/employee/GrnPaymentCtrl.coffee