Ignoring proguard-project.txt
Merge branch 'master' into database