herp derp kinda works
Merge origin into master.  Merge conflict at Camera.java