- recently added container recycling
- fixed bug add and edit forms for book
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/views/recently_added_view.php
Preparation for other material type filtering
Added Real data from ICS Library to Database
Merge branch 'master' of http://github.com/BuracayBeach/myfirstrepo into team4_v2.5
Fixed new SQL Data (real books)
Merge pull request #171 from BuracayBeach/team4_v2.5

Team4 v2.5
Merge pull request #172 from BuracayBeach/team1/dev

Team1/dev
AJAXified user search
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team3_v2.1
Merge pull request #173 from BuracayBeach/team3_v2.1

Team3 v2.1