Quickfix. Missed 1 thing in multiple_emails
Quickfix. Missed 1 thing in multiple_emails
Merge branch 'master' into msg_center2

Conflicts:
	cmn/directives.js
Merge branch 'msg_center2' of github.com:sharewave/frontus into msg_center2