Add unit tests for rich_text.py
Merge branch 'master' into rich-text-unit-tests
Alter comment formatting in wagtailcore tests.py
Merge branch 'master' into rich-text-unit-tests
Merge pull request #362 from mope/rich-text-unit-tests

Rich text unit tests
Fixed useages of deprecated templatetags
Merge pull request #384 from kaedroho/deprecation-warning-cleanup

Fixed useages of deprecated templatetags
stray > removed
fixing buttons that were hidden after previous button styling work
Fixed typos in a couple of deprecation warnings
Added check to page create view to make sure the selected class is a descendant of Page
merge conflict in page-editor.scss resolved. Login styles updated to suit new use of iconfield