jquery
Merge branch 'master' of https://github.com/JannWencyTico/rmsproject

Conflicts:
	application/views/includes/navi_hr.php