Adds 1 rule creation in activity edit form
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into activity-refactoring
Fixes bug with resultComparison
Sets min int values in activity parameters edition
activity update (remove primary resource)
Adds badge selection into activity edit form
Improves activity rule edit form
Fuses 2 methods in ActivityManager
Adds data fixture for activity rule action
Font Awesome update
Adds rule type initilization in data fixture & updater
Hides activity rule form when evaluation type is not set to automatic
Merge branch 'master' into 3.0-dev

Conflicts:
	Resources/translations/platform.en.yml
	Resources/translations/platform.es.yml
	Resources/translations/platform.fr.yml
Merge pull request #653 from stefk/merge-3.0

Merge 3.0
Removes rule type option and improves activity status detection
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into activity-refactoring
Replaced spaces by hyphens in public urls
Merge pull request #654 from stefk/public-urls-fix

Replaced spaces by hyphens in public urls
Fixed updater version
Merge pull request #655 from stefk/public-urls-fix

Fixed updater version