Started notifications
Added more notifications
Merge branch 'master' into notifications

Conflicts:
	base/views.py
	managers/models.py
Merge branch 'master' into notifications
Fixed a bad template tag
Merge branch 'master' into notifications