Font Awesome update
Font Awesome icons update
Merge remote-tracking branch 'upstream/3.0-dev' into font-awesome

Conflicts:
	Resources/translations/platform.fr.yml
Merge remote-tracking branch 'upstream/3.0-dev' into font-awesome

Conflicts:
	Library/Installation/AdditionalInstaller.php
	Manager/ActivityManager.php
Merge remote-tracking branch 'upstream/3.0-dev' into font-awesome
Merge pull request #658 from solispauwels/font-awesome

Font Awesome icons update
Merge pull request #661 from kitan1982/activity-refactoring

default starting date for rule + updater & data fixture bugfix
Merge pull request #663 from kitan1982/activity-refactoring

Merge branch 'merge' of https://github.com/Elorfin/CoreBundle
Rename field where in ActivityParameters & adds a button to know activity status