Merges with marej
Merge pull request #3 from galileo/feature-activity-controller

Feature activity controller