possible bugfix
ImageSet recognises active/inactive items
imageset slider improvements
imageset slider improvements
menu template/css improvements
better control over pagetitle in arkestra pages
entity image must use crop
font-weight on image links
now use django-treeadmin for MPTT
tidy code
correct example_database.json
Entity tree list improvement
ExternalLink needed get_absolute_url()
Merge branch 'treeadmin' into develop
setup.py
setup.py
on_delete for ForeignKeys
Merge pull request #74 from evildmp/foreignkeys

on_delete for ForeignKeys, and respect Person.active
Merge branch 'link-schemas' into develop
Merge remote-tracking branch 'remotes/upstream/develop' into develop

Conflicts resolved:
	contacts_and_people/models.py
	contacts_and_people/templatetags/entity_tags.py
	contacts_and_people/views.py
	links/models.py
	news_and_events/models.py