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
Merge branch 'master' into 3.0-dev
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into 3.0-dev
Merge pull request #657 from stefk/3.0-merge

3.0 merge
Merge pull request #647 from kitan1982/activity-refactoring

Adds rule definition in Activity edit form
Sets rule default starting date to activity creation date
Merge branch '3.0-dev' of https://github.com/claroline/CoreBundle into activity-refactoring