Merge pull request #394 from MIT-Mobile/3.6/dev-intrepid-lwright-shuttles

3.6/dev intrepid lwright shuttles
Fixing timer selector issue