add try/catch for merging context changes. fixes crash on iOS6 when importing objects with related obects in a single save
Merge branch 'master' of github.com:gdavis/Gravity