use bootmenu cm11 branch for cm11
Merge remote-tracking branch 'cm11/cm-11.0' into cm-11.0

Conflicts:
	local_manifest_mb525.xml
Added and updated local_manifests