Deletes last migrations
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into activity-refactoring

Conflicts:
	Manager/ActivityManager.php
	Migrations/drizzle_pdo_mysql/Version20140605142250.php
	Migrations/ibm_db2/Version20140605142250.php
	Migrations/mysqli/Version20140605142250.php
	Migrations/oci8/Version20140605142250.php
	Migrations/pdo_ibm/Version20140605142250.php
	Migrations/pdo_mysql/Version20140605142250.php
	Migrations/pdo_oci/Version20140605142250.php
	Migrations/pdo_pgsql/Version20140605142250.php
	Migrations/pdo_sqlite/Version20140605142250.php
	Migrations/pdo_sqlsrv/Version20140605142250.php
	Migrations/sqlsrv/Version20140605142250.php
Adds plugin config file options to define allowed activity rule action
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into activity-refactoring

Conflicts:
	Manager/ActivityManager.php
Adds log to activity evaluation
Deletes temporary migrations
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into activity-refactoring
Adds Log to Evaluation
Merge branch 'master' of https://github.com/claroline/CoreBundle into activity-refactoring
Adds active date to Rule
Improves evaluation method and adds updater for rule action
Removes additional datas from Rule entity
Deletes useless migrations
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into activity-refactoring

Conflicts:
	Manager/ActivityManager.php
Regenerates rule migrations
Activity update + new translations
Merge remote-tracking branch 'upstream/3.0-dev' into activity
Fixed typo
Merge pull request #639 from stefk/config-fix

Fixed typo in firewall config
activity update