Merge tags field fixed - added status n email n shiz to users table

Conflicts:
	system/cms/modules/users/controllers/admin.php
	system/cms/modules/users/views/admin/users/form.php