- lol
Merge pull request #347 from BuracayBeach/team_UI

Team ui
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/create_admin_view.php
	application/views/home_contents_view.php
	js/faq_manager.js
fixed double search results inclusion
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team4_v2.6.5
Merge pull request #348 from BuracayBeach/team4_v2.6.5

Team4 v2.6.5
- fixed sources
Merge remote-tracking branch 'origin/master'
- fixed form, AGAIN
added css to admin login
Merge pull request #349 from BuracayBeach/team1/dev

Team1/dev
mend
Merge pull request #350 from BuracayBeach/team2_v5.8

Team2 v5.8
- fixed announcements hiding in admin
Merge pull request #351 from BuracayBeach/team1/dev

- fixed announcements hiding in admin
menulinks border bottom style
changed logo on googlemode
Merge branch 'master' of http://github.com/BuracayBeach/myfirstrepo into team_UI