Merge branch 'portal-update' into remotes/origin/develop

Kostis Trantzasrequested to merge
portal-update into develop

Closes #29 (closed)

Merge request reports