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

Conflicts:
	application/config/routes.php
	application/controllers/add.php
	application/controllers/facu_cont.php
	application/controllers/home.php
	application/models/hr.php
	application/models/m_login.php
	application/models/registration_model.php
	application/views/add.php
	application/views/facu_home.php
	application/views/firstpage.php
	application/views/form_login.php
	application/views/management.php
	application/views/sixthpage.php
	application/views/update.php
	application/views/view.php