More camera and android stuff
Merge branch 'master' of https://github.com/chrisgp/Photon