Get rid of camera controller
Merge remote-tracking branch 'origin/master'
ner
Merge remote-tracking branch 'origin/arugg003'