- Change target of AndroidJUnitTests to API 18
- Get DataModel from factory rather than specify with Intent
- Reorganize packages
- Add PreferencesFilePersisterTests and DataModelPersisterTests