Merge pull request #85 from abdulrauf/master

nav tree fix
Merge pull request #88 from abdulrauf/master

S3 - mixin fixes for TV
Home Page setting for single site
embed in progress
Merge branch 'master' of https://github.com/Gluttonberg/core
multiple asset category filter - fixed broken collections in asset selector
Merge branch 'refs/heads/master' into 3.0

Conflicts:
	app/views/gluttonberg/admin/settings/configurations/_settings_table.html.haml