images, database
merge jessie's code
Merge branch 'master' of https://github.com/smittex/mobileapp