video configuration
Merge pull request #7 from mondora/APP-7

APP-7
Merge branch 'master' into APP-310
Merge branch 'APP-310' of github.com:mondora/mnd-website into APP-310