Merged some code from playerWithMaps.  Some fixes for layout issues. A fix for an error that gets thrown that stops execution when it is not necessary to stop (see Controller.js, line 70).  Added a check for mp4 compatibility, that shows an error screen when mp4 cannot be played.
Merge pull request #50 from phyrworks/master

Merged some (non-map) code fixes from playerWithMaps.