allow dev to add a secondary sidebar on right side of the screen
pre pull commit
Merge branch 'master' of github.com:claroline/CoreBundle into claroline-cache

Conflicts:
	Manager/MailManager.php
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