- added other column for add
- upgraded safeguard
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
- carousel announcements
      - fixed rich text editor width for editing
 - updated css from bianca
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/header.php
	css/style5.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/update_admin_view.php
Merge remote-tracking branch 'origin/master'
announcements carousel (non responsive)
Merge pull request #250 from BuracayBeach/team1/dev

Team1/dev