Merigng LaunchActivity
Checking in merged branches to master