Adding is_enabled field.
dockblock
Merge branch 'master' of github.com:claroline/CoreBundle into delete-user
Fixing tests.
Users getters return "deleted user" if the user is not enabled.
Renaming the custom installer.
typo
Macro for displaying user names.
Using username in the macro.
Merge pull request #314 from ngodfraind/delete-user

Delete user
Fixed log pages issues
Merge pull request #315 from stefk/log-fixes

Fixed log pages issues
Merge branch 'master' of github.com:claroline/CoreBundle into set-registration-mail-content

Conflicts:
	Entity/User.php
	Library/Installation/AdditionalInstaller.php
	Library/Installation/Updater/Updater020900.php
	Resources/translations/platform.fr.yml
Merge pull request #5 from ngodfraind/set-registration-mail-content

Set registration mail content