Added license info
Added license info (2)
Merge pull request #190 from stefk/license

Added license info
Add right check on workspace badge pages
Merge pull request #191 from maxailloud/right_checking_for_badge_on_workspace

Add right check on workspace badge pages
Correct right checking for delete badge action
Merge pull request #192 from maxailloud/right_checking_for_badge_on_workspace

Correct right checking for delete badge action on workspace
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Resources/public/js/tinymce/config.js