Clean Camera class
Merge branch 'CoreBuilding'