Fixes
Merge branch 'master' of https://github.com/thirdknife/kka-laravel

Conflicts:
	app/views/site/trip.blade.php