Updated shoot and share buttons with new icons and layout
file name change: btn_camera -> btn_shoot
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/res/layout/camera_overlay_bottom.xml
added settings button