Merge pull request #5 from uwdreamproject/can

Spring 2013 CAN updates
Merge pull request #8 from uwdreamproject/can

Merge in CAN late-summer 2013 changes
Merge pull request #11 from uwdreamproject/matt-develop

Iteration #52 updates
Merge branch 'matt-develop'
Adds mentor group filtering for activity log summaries
Merge branch 'master' into matt-develop
Adds warning in dev-inspector when working copy is master branch