Merge branch 'master' into FTP_v1

Conflicts:
	application/controllers/admin_account.php
	application/controllers/announcement.php
	application/controllers/book.php
	application/models/admin_account_model.php
	application/models/favorite_model.php
	application/models/lend_model.php
	application/models/notifs_model.php
	application/models/reserve_model.php
	application/models/user_account_model.php
	application/views/admin_login_view.php
	application/views/header.php
	js/search/searchresults.js