modif var
Merge branch 'master' of github.com:azriel68/AToMicERP

Conflicts:
	modules/user/template/group.html