FTP_v1
- experiment
wat
- FUUKKK
- Now Working on hosted website
Merge branch 'FTP_v1' into merge/ftp-master

Conflicts:
	application/controllers/announcement.php
	application/controllers/book.php
	application/controllers/home.php
	application/views/admin_login_view.php
	application/views/header.php
Merge branch 'FTP_v1' into merge/ftp-master

Conflicts:
	application/controllers/announcement.php
	application/controllers/book.php
	application/controllers/home.php
	application/views/admin_login_view.php
	application/views/header.php
- config db
enable_disable - error on search accounts
back to google - whitespace before <?
df
fixed hiding of edit announcement form
Merge branch 'master' into FTP_v1

Conflicts:
	js/announcements_manager.js
- experiment
wat
fixed hiding of edit announcement form
Merge branch 'master' into FTP_v1

Conflicts:
	js/announcements_manager.js
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
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
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
- removed jquery fly fly