sobrejat acabat
Merge branch 'sombrejarDestins' into develop

Conflicts:
	app/views/group.html