Issue #466- remove unneeded activities from manifest
Issue #466- remove unneeded endpoints from routing
Issue #466 - fix spaces
Issue #466 - Fix Routing
Merge pull request #479 from ndomar/C3_sak93_66_fixRoutingAndManifest

Issue #466 -  Bug : Fixing the routing file and android manifest file
Issue #400 - fix conflicts