* changed routes
don't commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/HomeController.php
	app/models/Category.php
	app/routes.php
	app/views/category.blade.php
	app/views/include/category_sidebar.blade.php
	app/views/layout_home.blade.php