Add is_blocked to users
Merge branch 'refs/heads/2.3/develop' into 3.0/develop

Conflicts:
	system/cms/modules/users/controllers/admin.php
	system/cms/modules/users/views/admin/users/form.php
Merge branch 'refs/heads/3.0/develop' into AIWS/production