Reimplemented the way the map is restored, now markers are not redrawn every time, but reused.
Merge branch 'master' into Cahue

Conflicts:
	app/src/main/java/com/bahpps/cahue/MapsActivity.java
Merge remote-tracking branch 'origin/Cahue' into Cahue

Conflicts:
	app/src/main/java/com/bahpps/cahue/MapsActivity.java
Fixes after merge