Merge branch 'release/2' into develop

• Fix reset freeze
• public method for mapping json to nsmanagedobject
Remove commentted out code in fixture helper
Update pod version in READme
Merge branch 'master' of github.com:cynicalcocoa/cycoredata