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

Conflicts:
	client/app/main/main.html
	server/model/file.model.js