added first-launch experience
Added a ‘first launch experience’ controller.
Merge branch 'master' of github.com:maharris1011/Pelotonia into androidStudio
Merge branch 'androidStudio' of github.com:maharris1011/Pelotonia into androidStudio
update version number
remove markharris-specific directories from search path
Merge branch 'v_2014_4'
Merge branch 'master' of github.com:maharris1011/Pelotonia into androidStudio