Stop proguard from removing methods which are accessed by reflection
Migrate androidmapviewballoons and bostonbusmap to gradle
Fix syntax error
Remove redundant import, add comment
Allow intents to open for specific route, stop and mode
Finishing getting gradle to work with android studio
Merge branch 'gradle'
Update gitignore
Merge branch 'master' into alarms

Conflicts:
	src/boston/Bus/Map/main/Main.java
Add full_screen_alarm
Remove Exception
Read block parameter in NextBus predictions. Fix commuter rail predictions
to show delays correctly
Typo fixes
Change int to enum
Fix duplicate prediction bug
Get proguard working with gradle
Add run number text to More Info page
Add stopid to each prediction for easier merging with alarms branch
Merge branch 'master' into alarms

Conflicts:
	src/boston/Bus/Map/data/CommuterRailPrediction.java
	src/boston/Bus/Map/data/TimePrediction.java
	src/boston/Bus/Map/main/Main.java
	src/boston/Bus/Map/parser/BusPredictionsFeedParser.java
	src/boston/Bus/Map/parser/CommuterRailPredictionsFeedParser.java
	src/boston/Bus/Map/parser/HeavyRailPredictionsFeedParser.java