Merge branch 'master' into 117-implement-pain

android/app/build.gradle

android/app/src/main/AndroidManifest.xml

android/app/src/main/java/com/drip/MainApplication.java

android/app/src/main/res/drawable-hdpi/ic_notification.png

android/app/src/main/res/drawable-mdpi/ic_notification.png

android/app/src/main/res/drawable-xhdpi/ic_notification.png

android/app/src/main/res/drawable-xxhdpi/ic_notification.png

...oid/app/src/main/res/drawable-xxxhdpi/ic_notification.png

android/app/src/main/res/mipmap-hdpi/ic_launcher.png

android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png

android/app/src/main/res/mipmap-hdpi/ic_notification.png

android/app/src/main/res/mipmap-mdpi/ic_launcher.png

android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png

android/app/src/main/res/mipmap-mdpi/ic_notification.png

android/app/src/main/res/mipmap-xhdpi/ic_launcher.png

android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png

android/app/src/main/res/mipmap-xhdpi/ic_notification.png

android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png

android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png

android/app/src/main/res/mipmap-xxhdpi/ic_notification.png