ops
Merge branch 'master' of https://github.com/alpkeser/Garenta_Service

Conflicts:
	Garenta_Service/AppDelegate.m
	Garenta_Service/ApplicationProperties.m
okay
of