Fixade till manage_users.php och edit_user.php
Merge branch 'master' of https://github.com/Walkingmage/OHLALA

Conflicts:
	manage_users.php