image loading issue
Merge branch 'master' of https://github.com/kaskasi/Weather-History

Conflicts:

Weather-History/app/src/main/java/de/fluchtwege/weatherhistory/ui/Curren
tWeatherFragment.java