Add 1-4 grid classes to the WYSIWYG style dropdown.
Merge branch 'drupal-7.22' of github.com:web-arts-unimelb/custom into drupal-7.22