added user type to index view
Merge remote-tracking branch 'origin/user-management' into user-management

Conflicts:
	users/index.php