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

Conflicts:
	app/controllers/HomeController.php
	app/routes.php

Signed-off-by: van_hsky <xezw211@126.com>
Merge branch 'master' of https://github.com/xezw211/van_laravel