- 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'
fixed favorites, reserved, borrowed views
Merge pull request #241 from BuracayBeach/team2_v5.0c

fixed favorites, reserved, borrowed views
updated css, fixed clickable tag
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team4_v2.6.2
Merge pull request #242 from BuracayBeach/team4_v2.6.2

Team4 v2.6.2
fix account create/edit view
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team2_v5.0d
Merge pull request #243 from BuracayBeach/team2_v5.0d

Team2 v5.0d
Merge remote-tracking branch 'origin/master'
Fixed javascript dynamic positioning for fixed elements (Navbar and Search) --- Try to resize the browser window and see magic
fixed login css input
Merge pull request #244 from BuracayBeach/team_UI

Fixed javascript dynamic positioning for fixed elements (Navbar and Sear...
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team2_v5.1c
Merge pull request #245 from BuracayBeach/team2_v5.1c

Team2 v5.1c
- 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