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

APP-7
Merge branch 'master' into APP-308