# WARNING: head commit changed in the meantime

Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/hris/index.php