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

Conflicts:
	package.json
Merge branch 'master' of https://github.com/fex-team/agroup