Merge pull request #2 from gloriamaris/KEVIN-employee_list_module_07/10/2014

Department List
Added "Department" option on navigation sidebar.
Merge pull request #4 from izephyrmor/master

Added "Department" option on navigation sidebar.
Merge remote-tracking branch 'upstream/master' into KEVIN-employee_list_module_07/10/2014

Conflicts:
	application/controllers/home.php