Cocos3D_1
Merge branch 'master' of https://github.com/atacengiz/Garenta_Service

Conflicts:
	Garenta_Service.xcodeproj/project.pbxproj
	Garenta_Service/AppDelegate.m
	Garenta_Service/DetailVC.h
	Garenta_Service/DetailVC.m