Finished the functionality for approval
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/templates/messages/types/arwenewcustomer-body.hbs
Changed to admin message usage.
Merge remote-tracking branch 'origin/master'
Just small stuff added.
Fixed it.