Merge pull request #43 from californiavol/imac-work

Merge pull request #42 from californiavol/master
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 #45 from californiavol/imac-work

Imac work
Merge pull request #46 from californiavol/macbook-branch

Macbook branch
Merge pull request #47 from californiavol/master

merge master into imac-work