testbranch_2

Camera_rename
Merge pull request #1 from Schranz0r/testbranch_cam

Merge testbranch_cam to testbranch