adds user editing
Merge branch 'master' of https://github.com/code-berlin/raa

Conflicts:
	application/models/admin_m.php