Manifest: update after months
Merge branch 'master' of github.com:DXC0/local_manifests

Conflicts:
	roomservice.xml