edit masklayer
Merge branch 'master' of https://github.com/calfjohn/StbProject
add two dotguy and add playvideo support
Merge pull request #21 from encal/master

new
merge