Merge pull request #25 from arieldiamond/dusty_mobile_prep

adding mobile prep in activities controller
Merge branch 'master' into dusty_mobile_prep