Modifications to build.gradle and AndroidManifest.xml
Add release config options to build.gradle
Merge branch 'master' into prod