Merge pull request #1 from impresspages/master

Merge
Merge pull request #2 from impresspages/master

Merge
Column Managment for widgets
Fix for multiple nested columns
Revert "Fix for multiple nested columns"

This reverts commit 99dcf5512fbfeee3264872fe5c3a77f66da6c3a6.
Revert "Column Managment for widgets"

This reverts commit 1d179cb49efd76396f6be4f627963f5d3fb19927.
Up to one aditional layer of nested widgets.

This will alow custom widgets to have columns inside if they are not
already in columns
Fix deletion moves widgets out of nested blocks
Alow nesting of all custom widgets, up to 4 levels.
Reinit blocks after widget move
Remove dublicate line
Fix nested Columns
Merge remote-tracking branch 'fobas/master' into nested-coumns
TinyMCE filters fix

TinyMCE filters correction:

* table border
* tr|th colspan|rowspan
* h[1-6]
Merge pull request #537 from Nemesiz/master

TinyMCE filters fix
Merge branch 'master' of github.com:impresspages/ImpressPages
Merge branch 'master' into nested-coumns