Merge pull request #327 from dburdick/develop

Move activities to backup model