search message added
Merge branch 'master' of https://github.com/sverro2/WEBS2

Conflicts:
	application/views/pages/category.php