Merge origin/master
	Design Signup.php
	Design Profil.php
Conflicts: