backup.
Merge branch 'james'
Merge branch 'master' of https://github.com/bingdow/foxCam