fixed reserves_view.php error
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team2_v3.2
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team2_v3.2
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team2_v3.2
- you can only manage books now from home and index
- upgraded edit faq module
- upgraded edit faq module
- added help_view and help() function in home
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team2_v3.2
Refactored Ady's Code for enable disable
Merge branch 'master' of http://github.com/BuracayBeach/myfirstrepo into team4_v2.4.6
- Finished edit faq module
SQL Merged with Ady's Valid Users from OUR
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/home.php
	application/views/announcements_view.php
	application/views/search_results_view.php
	css/style3.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/home.php
	application/views/announcements_view.php
	application/views/search_results_view.php
	css/style3.css
-renamed nicEdit src to compressed file
-renamed nicEdit src to compressed file
-renamed nicEdit src to compressed file
-renamed nicEdit src to compressed file
Initial Layout for add/edit/and other Material
resolved conflicts