Merge branch 'feature/objective-c' into develop
objc: minor fix
objc: cleaned up KPilot abit