Merge branch 'master' into Add-Activity
ActivityViewerUI & ActivityViewerPresenter worked on.
Minor changes before merge...
Merge branch 'Add-Activity'