partial commit
Merge branch 'master' of https://github.com/claroline/CoreBundle into agenda
partial commit
Merge branch 'master' of https://github.com/claroline/CoreBundle into agenda
Merge branch 'master' of https://github.com/claroline/CoreBundle into list-roles-userpics
add datepicker (partial commit
intermediate commit
docblocks
itermediate commit
Doc block.
Merge branch 'master' of https://github.com/claroline/CoreBundle into administration-user-lists
Doc blocks.
dockblocks.
Pagination max limit.
Merge branch 'master' of https://github.com/claroline/CoreBundle into administration-user-lists

Conflicts:
	Manager/MessageManager.php
	Resources/public/js/table.js
	Resources/views/Tool/workspace/roles/workspaceUsers.html.twig
partial commit
partial commit
partial commit
Merge branch 'master' of https://github.com/claroline/CoreBundle into administration-user-lists

Conflicts:
	Manager/MailManager.php
	Manager/MessageManager.php
Fixing merge.