small changes in manifest and launch configurations
merge