Getting ready for new commits
Merge branch 'ose' of https://github.com/Team-OSE/platform_manifest into ose

Conflicts:
	default.xml