Remove obsolete activity from manifest
Merge remote-tracking branch 'origin/master'