TinyMCE update
Merge remote-tracking branch 'upstream/master'
TinyMCE update
mrclay/minify dependency
Tiny MCE Update + JsMin and  CssMin filters
TinyMCE Update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Resources/views/Tool/workspace/roles/unregisteredUsers.html.twig
	Resources/views/Tool/workspace/roles/usersOfGroup.html.twig
	Resources/views/less/layout.less
Fix small bugs
Fix small bugs
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
GUI update (Fix small bugs)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Resources/public/js/tinymce/config.js
Merge pull request #188 from solispauwels/master

TinyMCE Update
Added tracking menu action and restyled logs layout
Merge remote-tracking branch 'upstream/master'
Renamed Updater
Merge pull request #193 from ptsavdar/master

Added tracking menu action and restyled logs layout
Change tinymce.activeEditor when click in resource picker
Merge remote-tracking branch 'upstream/master'