upgrade to lates OCMock and Kiwi
Merge branch '1.6.1.release'