Fixes #219: Addresses app crashes from dropbox conflicts due to merge errors
Merge pull request #220 from stevendpclark/219-dropbox-conflict-bugfix

Fixes #219: Addresses app crashes from dropbox conflicts due to merge errors