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
Merge pull request #644 from solispauwels/activity

Activity update
Update composer.json: jms serializer ~0.12
Merge pull request #650 from baptisteCable/master

Update composer.json: jms serializer bundle ~0.12
Fixing a bug wich didn't allow users to edit their profile.
Merge pull request #652 from ngodfraind/bugfix

Fixing a bug wich didn't allow users to edit their profile.
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
Merge remote-tracking branch 'upstream/3.0-dev' into font-awesome

Conflicts:
	Resources/translations/platform.fr.yml