Out-commented unused string constants to make it build again with Xcode 5.1
Merge branch 'Head' into Feature-SVNmaster