activitypage
Merge branch 'arian' into dev
activtypage merge