Merge branch 'master' of https://github.com/xezw211/van_laravel
Merge branch 'master' of https://github.com/xezw211/van_laravel

Conflicts:
	app/controllers/BlogController.php
	app/controllers/BlogFilter.php
	app/filters.php
	app/routes.php