themes14
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/WebsiteController.php
	app/views/website_user/index.blade.php
	app/views/website_user/page_design.blade.php
	app/views/website_user/template.blade.php