allow dev to add a secondary sidebar on right side of the screen
Event system for getting validation link for badge log
Manage validation link only if rules are respected
Temporarily locked doctrine bundle version (see doctrine/DoctrineBundle#249)
Merge pull request #327 from stefk/doctrine-bundle-version

Temporarily locked doctrine bundle version
Merge pull request #325 from maxailloud/validation_link_on_badge_page

Validation link for awarded badge action
pre pull commit
Merge branch 'master' of github.com:claroline/CoreBundle into claroline-cache

Conflicts:
	Manager/MailManager.php
Correct when id index doesn't exist
Merge pull request #328 from maxailloud/validation_link_on_badge_page

Correct when id index doesn't exist when validation link generation
Claroline cache system.
Merge pull request #329 from ngodfraind/claroline-cache

Claroline cache
Merge pull request #324 from Elorfin/right-sidebar

allow dev to add a secondary sidebar on right side of the screen
Fixing shortcut suppression.
Merge pull request #330 from ngodfraind/resource-link-delete

Fixing shortcut suppression.
Refactored integration tests
Merge branch 'master' into behat

Conflicts:
	Tests/Integration/Context/FeatureContext.php
Merge pull request #331 from stefk/behat

Integration tests refactoring
Added forward slash in base url
Google meta tag