Notification updates
Merge branch 'master' of github.com:HalcyonEngineering/PVMS

Conflicts:
	protected/data/pvms.sqlite