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