Merge branch 'master' of https://github.com/mariokeller/test

Conflicts:
	user.php