Some bug fixes.
Consolidated User and User Admin modules.  Document code.
Added too many improvements to list.
Minor adjustment.
Some bug fixes.
Merge commit '66a0b12'

Conflicts:
	application/modules/user/controllers/user.php
	application/modules/user/models/user_model.php
	application/modules/user/views/admin_role_add.php
	application/modules/user/views/admin_role_edit.php
	application/modules/user/views/user_add.php
	application/modules/user/views/user_edit.php
	application/modules/user/views/user_login.php
	application/modules/user_admin/controllers/user_admin.php
	application/modules/user_admin/views/user_admin_add_user.php
	application/modules/user_admin/views/user_admin_edit_user.php
	application/modules/user_admin/views/users.php
Merge commit '77d1bc5'
Various improvements and additions.