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.
change in announcement table

change in announcement table
Merge branch 'master' of https://github.com/jeffreycanoy92/OSNET-1 into JEFFREY-announcements_table_db_change_07/11/2014

Conflicts:
	application/config/config.php
	application/controllers/home.php