Changed build.gradle. Using  build tools 21.1.1
Merge branch 'master' into development
Added DB file