remove OCMock for now
Merge branch 'master' into rc
update tag in podspec