format MapActivity
Merge remote-tracking branch 'origin/master'

Conflicts:
	Passenger/.idea/workspace.xml
format MapActivity