Camera commit
Merge branch 'master' of https://github.com/Thirdship/ColdBoot.git