`
Merge remote-tracking branch 'origin/master'
Completely fixed bug through which maps were not shown and app crashed