Progress on database using 4
Progress database using 5
merge screen
Progress database using 6
Progress database using 7
Merge branch 'master' of https://github.com/antoinecronier/projectAndroid