Added new camera interface
Conflits in atlas
Merge branch 'master' of https://github.com/scwe/NWEN304Project