merge branches

Fix tour tests
Add test for bing search (images)
Add UI test for video and pdf bing search
Fix bing image search test
Add Skydrive mediapicker feature activation.
Implement SkyDrive mediapicker.
Merge branch 'BingSearchTests' of https://github.com/v-avdeev/ChronoZoom
Merge pull request #960 from a-chumagin/master

Bing search tests
improve bing search tests
[Hotfix] Fix regimes are not displayed in root collection
fix review issues from a-chumagin
Merge pull request #962 from alex-zen/hotfix-regimes

[Hotfix] Fix regimes are not displayed in root collection
Add Skydrive image scaling.

Details:
1. Add Skyrive image scaling.
2. Fixed bug when skydrive mediatype was dublicated in content item authoring form.
3. Fixed Skydrive XSS vulnerability.
Merge branch 'skydrive-image' of git://github.com/alex-zen/ChronoZoom into alex-zen-skydrive-image
Feature: Enabling CORS
Merge pull request #967 from a-chumagin/ImproveBingSearchTests

Improve bing search tests
Minor update of authoring error messages
Merge pull request #966 from alterm4nn/corsserver

Feature: Enabling CORS on server
Merge pull request #969 from alex-zen/master

Minor update of authoring error messages
Fixed authoring tests for mediasource