Correct uses of twolevelselect form field + make badge rule mechanism cleaner and more configurable
Merge branch 'master' into badge-api

Conflicts:
	ClarolineCoreBundle.php
	Resources/config/services.yml
	Rule/Entity/Rule.php
Correct namespace for oauth class
Add migration files for oauth entities
Added Workspace analytics
Merge remote-tracking branch 'upstream/master' into HEAD
Adding oauth security routes + move security controller
Additional installer for workspace analytics tool
Add documentation for oauth authentication for third-party application
Adding information about return format
Merge pull request #226 from easy-es/agenda

Agenda
Modify design of authorization page
Merge pull request #227 from ptsavdar/master

Added Workspace analytics tool
Modfy TemplateLocator to overload OAuthServerBundle template for authorize page
Remove debug code
CheckStyle correction
Used tinymce form field to prevent xss
Adding page for listing application that has access to your account
Adding name on oauth client
Fixed translations