slide and click
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/view.php
	application/views/namunaIns/Category.php