update
Merge branch 'master' of https://github.com/fex-team/agroup

Conflicts:
	server/api/message/message.controller.js
	server/config/environment/index.js
	server/config/seed.js