adding camera uploads
fixed merge in home view