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
Implement field validation for Site.is_default_site; resolves #289
Allow multiple sites with the same hostname but different ports; resolves #290
Add routing test for when two sites have the same hostname but different ports
Update Site.objects.get_by_natural_key() to include port
Update Site.find_for_request to respect https
Change the way we lookup the request port
Modify tests to include ports differently, add tests for unrecognised ports
Merge pull request #362 from mope/rich-text-unit-tests

Rich text unit tests
Add test that requests on unrecognised ports are routed to the expected site if no ambiguity
Refactor port/site tests into new test case and individual tests
Merge branch 'master' into site_model_adjustments

Conflicts:
	wagtail/wagtailcore/models.py
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