Update to database
Fixed merge conflicts
Merge branch 'master' of https://github.com/letsdoitworld/ldiw-iphone2