Fix conflicts in podspec
Merge branch 'master' of https://github.com/nobre84/OHAutoNIBi18n