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

Conflicts:
	app/controllers/TripController.php
	app/models/Destination.php
	app/routes.php
	app/views/site/filtered.blade.php
	app/views/site/front/detail.blade.php
	app/views/site/front/index.blade.php
	app/views/site/layouts/default.blade.php
	app/views/site/partials/footer.blade.php
	app/views/site/partials/navigation.blade.php
	bootstrap/start.php
	composer.json
	public/assets/js/travel/js-index3.js
	public/assets/js/travel/js-list4.js
Images
Merge branch 'master' of https://github.com/thirdknife/kka-laravel