Universal iPhone/iPad application debug compilation error for iPhone testing
Merge branch 'develop'