Merge branch 'master' into mbta
Merge branch 'mbta' into alarms
Add Android v4 support
Merge branch 'master' into mbta
Merge branch 'master' into alarms
Merge branch 'mbta' into alarms