begin refactoring
want your tests passing ? delete your tests.
update module model and update activity controller
Merge branch 'feature/refactor-activity' into develop