Merged migrations
Merge pull request #706 from stefk/merge-migrations

Merged migrations
Creates form type for activity past evaluation
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into activity-refactoring

Conflicts:
	Migrations/pdo_mysql/Version20140701094804.php