aa
Merge branch 'master' of https://github.com/Dunkerque/DEG

Conflicts:
	Deg(resto)/apps/profile.php