Fix custom style lost after adding layout

This pull request fixes the fact that custom styles are lost when
adding a layout to a page with blocks having custom styles.

Bug tracker: http://www.concrete5.org/index.php?cID=394701
Merge pull request #719 from mlocati/fix-customstylelost

Fix custom style lost after adding layout