Merge branch '2.0' into feature-tinymce-shorcodes

@juliotaylor created all the shortcodes we need, some won't work like the accordion and tabs ones. Let me know any comments.