some camera detection changes and optimization
Merge branch 'master' of https://github.com/matthewtidd/spy_assistant