- 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 pull request #247 from BuracayBeach/team4_v2.6.2

Team4 v2.6.2
prettify other stuffs
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team2_v5.1e
Merge pull request #248 from BuracayBeach/team2_v5.1e

Team2 v5.1e
removed _.swp and jquery at root
Merge pull request #249 from BuracayBeach/team2_v5.2

removed _.swp and jquery at root
removed .idea
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/update_admin_view.php
added favicon
Merge remote-tracking branch 'origin/master'
fixed mystery links for book view, updated tag linking
announcements carousel (non responsive)
Merge pull request #250 from BuracayBeach/team1/dev

Team1/dev