video streaming support added
fix variables
soporte comercial comentado
no quiere funcionar el modulo mp4
Merge branch 'staging' of https://github.com/iaen-edu/configuration into staging
Merge branch 'master' of https://github.com/edx/configuration into staging
Merge branch 'master' of https://github.com/edx/configuration into staging
Merge pull request #21 from apardo/staging

Staging
Merge branch 'master' of https://github.com/edx/configuration into staging
Merge branch 'staging' of https://github.com/iaen-edu/configuration into staging
Merge pull request #1034 from edx/jarv/clean-ami

Jarv/clean ami
Preview module store.
Adding mapping for preview host.
Removing preview hash gen.
removing preview runtime config.
Deleting legacy templates.
removing unused config.
should be a dict.
Merge pull request #1040 from edx/e0d/preview

E0d/preview
Merge branch 'staging' of https://github.com/apardo/configuration into staging