update
finish
Merge branch 'mysql'

Conflicts:
	package.json
	server/config/environment/index.js
Merge branch 'master' of https://github.com/fex-team/agroup

Conflicts:
	server/config/environment/index.js