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
Fixing some notification bugs + adding links.
Activity open
fix type
activity index update
Merge remote-tracking branch 'origin/3.0-dev' into facet-profile

Conflicts:
	Resources/views/Activity/index.html.twig
Merge pull request #631 from solispauwels/activity

Activity
Merge pull request #630 from ngodfraind/notifications

Fixing some notification bugs + adding links.
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
partial commit beta version
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into competence-referencial
Merge branch 'master' of https://github.com/claroline/CoreBundle into 3.0-dev

Conflicts:
	Resources/views/Activity/index.html.twig
Merge pull request #633 from kitan1982/3.0-dev

3.0 dev - merge with master
partial commit