Merge branch 'release/2'

• Fix reset freeze
• public method for mapping json to nsmanagedobject
Merge branch 'master' of github.com:cynicalcocoa/cycoredata
update
Unit test pass. Singleton extension exampled
Comment out isTest for unit tests. only works in armv7