Refreshed import in Android Studio
Merge conflict between master and develop