gui update
activity update + iframe.css inside layout.less
iframe heigth
Merge remote-tracking branch 'upstream/3.0-dev' into activity
Merge pull request #644 from solispauwels/activity

Activity update