Removed all release/retain/autorelease macros for backward comatibility
Adding recursive save of context
Use performBlockAndWait for all context interactions
Renamed import methods to reflect id parameter (objects, not just dictionaries)
Added findOrCreate pattern method
Added error callback in default error handler method
Fixing evil merge conflict
One more header fix
Making things work more better for iOS5 and background queues
Updated mogenerator
Merge branch 'master' of magicalpanda.github.com:magicalpanda/MagicalRecord
Renaming import methods to reflect general object usage (ie. importFromObject, not dictionary)
Add helper to set default model from a bundle for a particular class. Useful for unit testing with OCUnit
don't warn on performSelector messages.
update paramter to reflect object level importing
use prefixed methods
reorganization of source and project files
Merge branch 'master' into 2.0

Conflicts:
	Project Files/Mac App Unit Tests/Frameworks/GHUnit.framework/GHUnit
	Project Files/Mac App Unit Tests/Frameworks/GHUnit.framework/Headers
	Project Files/Mac App Unit Tests/Frameworks/GHUnit.framework/Resources
	Project Files/Mac App Unit Tests/Frameworks/GHUnit.framework/Versions/Current
	Project Files/Mac App Unit Tests/Frameworks/OCHamcrest.framework/Headers
	Project Files/Mac App Unit Tests/Frameworks/OCHamcrest.framework/OCHamcrest
	Project Files/Mac App Unit Tests/Frameworks/OCHamcrest.framework/Resources
	Project Files/Mac App Unit Tests/Frameworks/OCHamcrest.framework/Versions/Current
	Project Files/Mac App Unit Tests/Frameworks/OCMock.framework/Headers
	Project Files/Mac App Unit Tests/Frameworks/OCMock.framework/OCMock
	Project Files/Mac App Unit Tests/Frameworks/OCMock.framework/Resources
	Project Files/Mac App Unit Tests/Frameworks/OCMock.framework/Versions/Current
	Project Files/Magical Record.xcodeproj/project.pbxproj
	Project Files/Unit Tests/MagicalDataImportTestCase.h
	Project Files/iOS App Unit Tests/Frameworks/GHUnitIOS.framework/GHUnitIOS
	Project Files/iOS App Unit Tests/Frameworks/GHUnitIOS.framework/Headers
	Project Files/iOS App Unit Tests/Frameworks/GHUnitIOS.framework/Resources
	Project Files/iOS App Unit Tests/Frameworks/GHUnitIOS.framework/Versions/Current
	Project Files/iOS App Unit Tests/Frameworks/OCHamcrestIOS.framework/Headers
	Project Files/iOS App Unit Tests/Frameworks/OCHamcrestIOS.framework/OCHamcrestIOS
	Project Files/iOS App Unit Tests/Frameworks/OCHamcrestIOS.framework/Resources
	Project Files/iOS App Unit Tests/Frameworks/OCHamcrestIOS.framework/Versions/Current
	Project Files/iOS App Unit Tests/Frameworks/OCMock.framework/Headers
	Project Files/iOS App Unit Tests/Frameworks/OCMock.framework/OCMock
	Project Files/iOS App Unit Tests/Frameworks/OCMock.framework/Resources
	Project Files/iOS App Unit Tests/Frameworks/OCMock.framework/Versions/Current
Removing files not deleted during previous merge
File reorg, updating the README
Fixing unit tests to at least run
moving project files around a little
Extracted MagicalRecord helper methods into separate category files
Fixing unit tests
Refactor save* method names