add instance contentype and notified manager
Merge branch 'add-content-type' into develop

Conflicts:
	alert/managers.py
	alert/models.py