RC2

Removed references to shortcodes.
RC2

Moved #content .row, + minor updates