update
Merge branch 'develop' of https://github.com/linhcatcat/nghiphep into develop

Conflicts:
	app/logs/dev.log
	src/Application/BackendBundle/Controller/GroupController.php
	src/Application/UserBundle/Entity/GroupUser.php
remove group and remove group user relate