add xcode6 compatibility
Merge branch 'develop'