Merged changes
Merge branch 'master' of github.com:Base11Studios/web-quote

Conflicts:
	app/views/basic/sitemap.blade.php