update
Merge branch 'jb4.2' of https://github.com/coderzstas/platform_manifest into jb4.2

Conflicts:
	default.xml