x
Merge branch 'master' of https://github.com/faberyx/thezoo

Conflicts:
	app/views/manifest/home.blade.php