Correct uses of twolevelselect form field + make badge rule mechanism cleaner and more configurable
Minor doc update
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'
Resize tinymce after use resourcepicker
Merge pull request #194 from solispauwels/master

Change tinymce.activeEditor when click in resource picker
Making a rules mechanism a little bit more decoupled + adding resource constraint on rule
Update demo fixtures, Correct error when paste raw URLs in TinyMCE and add missing javascript files
Merge remote-tracking branch 'upstream/master'
Merge pull request #195 from solispauwels/master

Demo fixtures + TinyMCE + missing javascript files
Pages titles
Rename validator method + add restriction on the validator to allow rulable object to be restricted to whatever you want to (as long as it can be requested in the log table)
partial commit right in agenda
Merge pull request #196 from solispauwels/master

Pages titles
agenda right
add owner to write too
Move Rule class + add documentation on rule mechanism
Make ruleValidator a service + badge repository not a service anymore (why was it a service anyway?)
Merge branch 'master' into generic_restriction_rule_mechanism

Conflicts:
	Resources/views/Badge/Admin/add.html.twig
	Resources/views/Badge/Admin/edit.html.twig
	Resources/views/Badge/Tool/Workspace/add.html.twig
	Resources/views/Badge/Tool/Workspace/edit.html.twig