Set the app name in gradlew and included the IDEA plugin
Merge remote-tracking branch 'origin/master'