Fixed typo
Merge pull request #639 from stefk/config-fix

Fixed typo in firewall config
Fixed workspace widget instances bug
Merge pull request #641 from stefk/widget-fix

Fixed workspace widget instances bug
gui update
activity update + iframe.css inside layout.less
iframe heigth
Merge remote-tracking branch 'upstream/3.0-dev' into activity
Merge pull request #644 from solispauwels/activity

Activity update
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
Basic role verification.
Sets min int values in activity parameters edition
Update composer.json: jms serializer ~0.12
Merge pull request #650 from baptisteCable/master

Update composer.json: jms serializer bundle ~0.12
activity update (remove primary resource)
Adds badge selection into activity edit form
Profile preferences can be modified in the administration (it has no effect yet).
Improves activity rule edit form