Merge pull request #1794 from FinalAngel/develop

Frontend Enhancements
Merge pull request #1795 from FinalAngel/develop

fixes issues with floatings in grids
Merge branch 'develop' of github.com:divio/django-cms into develop