Merge pull request #706 from stefk/merge-migrations

Merged migrations
Translations
Using correct exception.
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into platform-packages

Conflicts:
	Migrations/pdo_mysql/Version20140701094804.php
es tranlsations
remove commented code
Merge pull request #705 from ngodfraind/bugfix

Bugfix
Creates form type for activity past evaluation
Merge branch '3.0-dev' into ws-inheritance-merge

Conflicts:
	Resources/public/js/resource/manager.js
	Resources/public/js/resource/manager/manager.js
	Resources/public/js/resource/manager/router.js
	Resources/public/js/resource/manager/server.js
	Resources/public/js/resource/manager/views/actions.js
	Resources/public/js/resource/manager/views/breadcrumbs.js
	Resources/public/js/resource/manager/views/filters.js
	Resources/public/js/resource/manager/views/form.js
	Resources/public/js/resource/manager/views/master.js
	Resources/public/js/resource/manager/views/nodes.js
	Resources/public/js/resource/manager/views/thumbnail.js
	Resources/views/layout.html.twig
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into activity-refactoring

Conflicts:
	Migrations/pdo_mysql/Version20140701094804.php
Merge branch 'remove-ws-inheritance' of http://github.com/stefk/CoreBundle into remove-ws-inheritance

Conflicts:
	Controller/Badge/Tool/WorkspaceController.php
	Controller/Tool/WorkspaceAgendaController.php
	Form/AgendaType.php
	Manager/AgendaManager.php
	Repository/UserRepository.php
Fixing updater.
Merge branch 'ws-inheritance-merge' into ws-in-merge

Conflicts:
	Controller/LayoutController.php
	Listener/Tool/ResourceManagerImportExportListener.php
	Manager/GroupManager.php
	Manager/UserManager.php
	Manager/WorkspaceTagManager.php
	Repository/UserRepository.php
	Resources/translations/platform.en.yml
	Resources/translations/platform.es.yml
	Resources/translations/platform.fr.yml
	Resources/views/Message/layout.html.twig
Removed remaining references to AbstractWorkspace
Fixed merge errors
Allows manager to edit past evaluations
Regenerated migration
Removed references to public profile
Sets default time for evaluation to NULL
Removed previously deleted listener