Merge remote-tracking branch 'origin/master' # Conflicts: # .idea/codeStyles/Project.xml # app/src/main/java/com/gcorp/retrofithelperexample/Application.kt # app/src/main/java/com/gcorp/retrofithelperexample/MainActivity.kt # retrofithelper/src/main/java/com/gcorp/retrofithelper/RetrofitClient.kt