rebase
Merge branch 'bam6' of github.com:iGio90/platform_manifest into bam6

Conflicts:
	default.xml