Changed maps library to mapsforge 0.4.0
Merge remote-tracking branch 'origin/master'