Updated activity references in manifest.
Removed non-relevant code.
Merge branch 'master' into UI_changes
Fixed activity name in manifest.