swag
 fixed merge
camera page
camera page changes