merek
mergin pagination
Merge branch 'master' of https://github.com/altepos/SI-bengkel

Conflicts:
	application/controllers/merek.php
pagination search page and auto complete