update for cb44 head

Signed-off-by: ChillyBean <ivanarroyo86@gmail.com>
Merge branch 'cb44' of https://github.com/chillybean/Manifests into cb44

Conflicts:
	cb44_local_manifest.xml