layout update
activity update
delete some stuff
Merge remote-tracking branch 'upstream/3.0-dev' into activity

Conflicts:
	Entity/Resource/Activity.php
migrations + undelete file
fix migrations
fix typos and small errors
commit export template buton
Merge pull request #629 from solispauwels/activity

Activity