Merge pull request #44 from californiavol/master

merge from master
removed one-off functions from test controller
fixed video sizing issue on android tablets
Merge pull request #46 from californiavol/macbook-branch

Macbook branch