no message
Merge branch 'master' of https://github.com/redlinx/hr_recordsystem

Conflicts:
	application/config/routes.php
	application/controllers/add.php
	application/controllers/home.php
	application/controllers/register_faculty.php
	application/controllers/update_faculty.php
	application/models/hr.php
	application/models/m_login.php
	application/models/registration_model.php
	application/views/add.php
	application/views/form_login.php
	application/views/management.php
	application/views/registration_form.php
	application/views/templates/layout.php
	application/views/update.php
	application/views/update_form.php
	application/views/view.php