Different notification types
Merge branch 'maester' of https://github.com/thinkrad/TPTeam into maester

Conflicts:
	TPTeam/NotificationManager.swift