tiny comment amends
external site model improvements
links template fixed
Merge pull request #100 from evildmp/genericmanagertests

tiny comment amends
Merge pull request #101 from evildmp/linkmodels

Linkmodels
news and events minor formatting changes
Merge pull request #102 from evildmp/newsandevents

news and events minor formatting changes
Merge remote-tracking branch 'remotes/upstream/develop' into test-upstream-merge

Conflicts:
	news_and_events/models.py