added  service templates
minor changes
Merge branch 'master' into feature/location-based-events

Conflicts:
	Caveman/Podfile