tiny mce update + layout update
Merge pull request #574 from solispauwels/master

tiny mce update + layout update