layout update
Merge pull request #627 from kitan1982/activity-refactoring

Activity refactoring
Merge pull request #628 from kitan1982/activity-refactoring

Activity refactoring
activity update
delete some stuff
Merge remote-tracking branch 'upstream/3.0-dev' into activity

Conflicts:
	Entity/Resource/Activity.php
migrations + undelete file
fix migrations
fix typos and small errors
commit export template buton
Merge pull request #629 from solispauwels/activity

Activity
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
Create activity
Activity open
fix type
activity index update
Merge pull request #631 from solispauwels/activity

Activity
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