Matching Bugfixes

Lots of matching bugfixes
Merge branch 'master' of https://github.com/Melleth/webtech3

Conflicts:
	application/models/search_model.php