Merge branch 'master' of github.com:claroline/CoreBundle into facebook-connect
Merge pull request #340 from ngodfraind/workspace-redirection

Workspace redirection
Merge pull request #343 from stefk/update-checks

Added checks on badges and front controller update
Used cache dir for sessions native storage
Renamed session handler factory
Override notification alias.
Renamed and moved database session manager
Removed duplicata.
Merge branch 'translations-proofreading' of http://github.com/jrm-unamur/CoreBundle

Conflicts:
	Resources/translations/agenda.en.yml
	Resources/translations/agenda.fr.yml
Merge pull request #342 from arnaudbey/iframe

Add class on iframed body
Merge branch 'master' of github.com:claroline/CoreBundle into facebook-connect
Merge pull request #344 from ngodfraind/workspace-redirection

Override notification alias.
Made labels more explicit
Moved factory to session dir
Merge pull request #347 from stefk/minor-changes

Minor changes
First version of new interface for managing badges
Adding edit and delete feature on collection
Let user click on button to valid collection title update
Added missing file checks
Merge pull request #348 from stefk/file-checks

Added missing file checks