Change device tree branch to jb-camera
Merge branch 'jellybean' of https://github.com/shumashv1/Schizoid into jellybean

Conflicts:
	default.xml