upgrade to activities 0.6 and do a jam upgrade
Merge branch 'master' into responsive