The username regex validator can be changed in platform_options.yml.
Merge branch 'master' of https://github.com/claroline/CoreBundle into userrname-authorized-chars

Conflicts:
	Entity/User.php
	Library/Configuration/PlatformConfiguration.php
	Library/Configuration/PlatformConfigurationHandler.php
Adding missing coma
Adds default menu actions to resource type if it has none during plugin update
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into activity-refactoring
Restored directory in activity blacklist
Removing old activities.
Merge pull request #718 from kitan1982/activity-refactoring

Adds default menu actions to resource type if it has none during plugin update
Reorganized analytics tool
Merge pull request #720 from stefk/analytics-tool

Analytics tool
Workspace favourite icon
Merge pull request #716 from ngodfraind/remove-activities-updater

Removing old activities.
Merge pull request #717 from ngodfraind/userrname-authorized-chars

Userrname authorized chars
Merge pull request #719 from ngodfraind/ergonomy

Ergonomy:
Merge pull request #721 from ngodfraind/favourite-workspace

Workspace favourite icon
Changed tool header for workspaces
Merge pull request #722 from stefk/voc-fix

Changed tool header for workspaces
Fixed yaml example format
Updating demo fixtures.
Merge branch 'master' of https://github.com/claroline/CoreBundle into demo-fixture