app changes
Merge branch 'master' of https://github.com/diogoviannaaraujo/beholder
Merge branch 'master' of https://github.com/diogoviannaaraujo/beholder
changing ocntent type to mp4
fixing merge