Merge branch 'master' into db-abstraction-always-benchmark Conflicts: .gitignore DaoExample/build.gradle DaoTestPerformance/src/androidTest/java/org/greenrobot/greendao/performance/PerformanceTest.java