additionalLinstaller
add row modify to users list table
users list avatar
Resource calendar translations.
Adding language parameter to the initialize.
Removing filter
Merge pull request #101 from ngodfraind/resource-calendar-translation

Resource calendar translations.
Resource picker can be opened on the first try.
user list with avatar
Merge branch 'master' of https://github.com/claroline/CoreBundle into user-list

Conflicts:
	Resources/views/Administration/userList.html.twig
description null
Prevented js injection on client and server-side for tinymce inputs
arbitrary z index (still buggy)
Merge pull request #102 from ngodfraind/resource-picker-fixes

Resource picker fixes
Merge pull request #103 from stefk/tinymce-js-inject

Prevented js injection on client and server-side for tinymce inputs
Merge branch 'master' of https://github.com/claroline/CoreBundle into user-list

Conflicts:
	Form/ProfileType.php
Merge pull request #88 from easy-es/user-list

User list
Fixing profile.
Merge branch 'master' of https://github.com/claroline/CoreBundle into fixing-profile

Conflicts:
	Resources/views/Profile/profile.html.twig
Merge pull request #104 from ngodfraind/fixing-profile

Fixing profile.