Create activity
Activity open
fix type
activity index update
Merge pull request #631 from solispauwels/activity

Activity
Merge branch 'master' of https://github.com/claroline/CoreBundle into 3.0-dev

Conflicts:
	Resources/views/Activity/index.html.twig
Merge pull request #633 from kitan1982/3.0-dev

3.0 dev - merge with master
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into facet-profile

Conflicts:
	Resources/views/Activity/index.html.twig