changed layout back to build
fixed plugins in plugins somewhat
Merge branch 'develop' of github.com:divio/django-cms into develop