Initial Push

Camera code! Also restructuring of classes, see Issue Tracker for
further details.
Merge dev-camera into dev

merging