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

Conflicts:
	application/controllers/Report_Controller.php
	application/controllers/change_pass.php
	application/controllers/display.php
	application/controllers/display_notification.php
	application/controllers/forms.php
	application/controllers/hr_update_form.php
	application/controllers/login.php
	application/controllers/ranking_committee.php
	application/controllers/register_faculty.php
	application/controllers/regularization_candidate.php
	application/controllers/search.php
	application/controllers/update_form.php
	application/controllers/upload.php
	application/controllers/upload_profPic.php
	application/controllers/verifylogin.php
	application/controllers/view_dean.php
	application/controllers/view_faculty.php
	application/controllers/view_hr.php
	application/plugins/html2fpdf.php
	application/views/add_children.php
	application/views/add_education.php
	application/views/add_skill.php
	application/views/add_training.php
	application/views/add_work.php
	application/views/dean_view_faculty.php
	application/views/display.php
	application/views/display_committee.php
	application/views/display_educNoti.php
	application/views/display_form.php
	application/views/display_profNoti.php
	application/views/display_regular_faculty.php
	application/views/display_trainingNoti.php
	application/views/display_unregular_faculty.php
	application/views/display_workExp.php
	application/views/form_login.php
	application/views/home_faculty.php
	application/views/home_hr.php
	application/views/home_rankChair.php
	application/views/home_rankMember.php
	application/views/hr_update_faculty_profile.php
	application/views/hr_view_faculty_children.php
	application/views/hr_view_faculty_education.php
	application/views/hr_view_faculty_profile.php
	application/views/hr_view_faculty_skill.php
	application/views/hr_view_faculty_spouse.php
	application/views/hr_view_faculty_training.php
	application/views/hr_view_faculty_work.php
	application/views/includes/navi_faculty.php
	application/views/includes/navi_hr.php
	application/views/includes/navi_rankChair.php
	application/views/includes/navi_rankMember.php
	application/views/rank_form.php
	application/views/ranking_committee.php
	application/views/registration_form.php
	application/views/search_form.php
	application/views/set_rankMembers.php
	application/views/update_children.php
	application/views/update_education.php
	application/views/update_form.php
	application/views/update_skill.php
	application/views/update_spouse.php
	application/views/update_training.php
	application/views/update_work.php
	application/views/upload_form.php
	application/views/upload_profPic.php
	application/views/vChangePassword.php
	application/views/view_candidate.php
	application/views/view_children.php
	application/views/view_education.php
	application/views/view_faculty_educ_noti.php
	application/views/view_faculty_prof_noti.php
	application/views/view_faculty_training_noti.php
	application/views/view_faculty_work_noti.php
	application/views/view_notification.php
	application/views/view_profile.php
	application/views/view_skills.php
	application/views/view_spouse.php
	application/views/view_trainings.php
	application/views/view_work.php
	assets/css/layout.css