Increment version number
Merge branch 'release/2' into develop

• Fix reset freeze
• public method for mapping json to nsmanagedobject