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

Conflicts:
	bower.json
	client/components/message/fileitem/fileitem.html
	client/index.html
	server/api/file/file.controller.js