Fixing timer selector issue
Merge pull request #395 from MIT-Mobile/3.6/dev-intrepid-lwright-shuttles

Fixing timer selector issue