Add parameters to constructors to make merging with mta branch easier
Add extra param
Fix Reference to Boston
Merging bug fixes from mta_citibike
Merge Citibike parsers into mta branch
Add script to start emulator with hardware acceleration
Merge branch 'master' into mta

Conflicts:
	src/boston/Bus/Map/data/Locations.java
	src/boston/Bus/Map/parser/MbtaAlertsParser.java
	src/boston/Bus/Map/transit/TransitSystem.java