Force saving of derived contexts to use alternate save method
Added a TODO to remind us to remove the failsafe when refactor is done
Merge pull request #1612 from wordpress-mobile/issue/1608-coredata-crash

Force saving of derived contexts to use alternate save method
Updating version number for internal build
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	WordPress/Classes/ContextManager.m