bug fixes widget
migration generate
Merge branch 'master' of https://github.com/claroline/CoreBundle into agenda
feature export event in ics format
Merge branch 'master' of https://github.com/claroline/CoreBundle into agenda
Merge branch 'agenda' of https://github.com/easy-es/CoreBundle into agenda
partial commit
check style
Merge branch 'master' of https://github.com/claroline/CoreBundle into agenda

Conflicts:
	Resources/views/less/layout.less
workspace administration management
check style
Fixed method call
check style
checkstyle
changing template name
Merge branch 'enhancement_user__badge_management' of http://github.com/maxailloud/CoreBundle
Merge branch 'agenda' of http://github.com/easy-es/CoreBundle
Merge branch 'workspace-administration' of http://github.com/easy-es/CoreBundle
Merged migrations
Merge pull request #390 from stefk/pr-merge

Merge