Change data model
Merge branch 'master' of https://github.com/letsdoitworld/ldiw-iphone2