verzia
Merge remote-tracking branch 'origin/master'

Conflicts:
	TaxiDriverTest/Scripts/Globals.js
	TaxiDriverTest/Scripts/MapView.js
	TaxiDriverTest/Scripts/_references.js