- 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'
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
prettify create/edit account view forms
Merge pull request #246 from BuracayBeach/team2_v5.1d

prettify create/edit account view forms
Finalized Tag linking, fixed container for search results for admin adn user
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team4_v2.6.2
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