updating to current vie-bundle
small markup and inclusion fixes
added a link in homepage fixtures
readded halloLiipStyle.css
Merge branch 'master' into update-liipvie-create

Conflicts:
	composer.lock
	src/Sandbox/MainBundle/Resources/views/skeleton.html.twig
get rid of obsolete save button, create does this for us
try to integrate tags with create tag widget. should work but does not, bergie supposes a createjs bug
updating composer.lock to latest vie-bundle
adjust sandbox to LiipVieBundle rewrite with createjs
hide tags, include css
Merge branch 'master' into update-liipvie-create

Conflicts:
	composer.lock
Merge remote-tracking branch 'origin/master' into update-liipvie-create
cleanup image upload handler, routing nameing
Merge remote-tracking branch 'origin/master' into LiipCreateBundle

Conflicts:
	src/Sandbox/AdminBundle/Admin/MultilangMenuItemAdmin.php
	src/Sandbox/AdminBundle/Admin/MultilangStaticContentAdmin.php
	src/Sandbox/AdminBundle/Admin/RouteAdmin.php
	src/Sandbox/AdminBundle/Resources/config/services.yml
	src/Sandbox/MainBundle/DataFixtures/PHPCR/LoadStaticPageData.php
	src/Sandbox/MainBundle/Document/DemoClassContent.php
enable tags
Merge remote-tracking branch 'origin/master' into LiipCreateBundle
Merge remote-tracking branch 'origin/update-liipvie-create' into LiipCreateBundle

Conflicts:
	src/Sandbox/MainBundle/Document/EditableStaticContent.php
	src/Sandbox/MainBundle/Resources/views/MultilangStaticContent/index.html.twig
using the create bundle and adjusting config. WIP, this still fails and needs an updated composer.lock after https://github.com/sonata-project/SonataCacheBundle/pull/20 has been merged
use createphp for blocks too
remove merge error