tablevied added
label added
Merge branch 'camera' into dev

Conflicts:
	Storyboard.storyboard