chris' changes
camera page settings
Merge branch 'camera_page'