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

Conflicts:
	Garenta_Service.xcodeproj/project.pbxproj