adding basic interfaces for the activities api
Merge branch 'appframework-master' into activities-api

Conflicts:
	lib/public/iservercontainer.php
initial implementation of activity manager
Merge branch 'master' into activities-api
adding OC6 public API for activities
Merge branch 'master' into activities-api
remove test code
Merge branch 'master' into activities-api

Conflicts:
	lib/private/server.php
Merge pull request #5249 from owncloud/activities-api

[OC6] Activities api