notification
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/org/dfir/harita/app/MapsActivity.java