Added camera barbutton
Resolved conflicts