- updated sql, fixed announcement and recently added bug
Merge remote-tracking branch 'origin/master'
- fixed buttons for editing books
- fixed buttons for editing books
- new button view
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/admin_ihome_view.php
Merge pull request #190 from BuracayBeach/team_UI

Team ui
Added readmore
Merge branch 'master' of http://github.com/BuracayBeach/myfirstrepo into team4_v2.5.2
Merge pull request #191 from BuracayBeach/team4_v2.5.2

Team4 v2.5.2
Updated unsetting  and something about admin login
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into Team_5_Version_2.0
Merge pull request #192 from BuracayBeach/Team_5_Version_2.0

Updated unsetting $_SESSION and something about adminlogin
partially working pagination. removed for now
Merge pull request #193 from BuracayBeach/team1/dev

Team1/dev
Merge pull request #194 from BuracayBeach/team3_v2.3

partially working pagination. removed for now
prettify the notifs view. hihi
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team2_v3.7
something
Merge branch 'master' of http://github.com/BuracayBeach/myfirstrepo into team_UI
Merge pull request #195 from BuracayBeach/team2_v3.7

Team2 v3.7