login error
add up sreenbar & edit Admin in list
Admin can not delete his own account
admin/user
Merge remote-tracking branch 'origin/loginscreen' into results

Conflicts:
	application/views/admin_view.php
Solved merge conflicts

see title