demoready
Merge branch 'master' of https://github.com/funtrix/exjobb

Conflicts:
	includes/top_menu/search.php