working on notifications

Conflicts:
	HighlanderChef/project.properties