Change MainActivity for stopping services
Merge remote-tracking branch 'origin/development/architecture' into development/architecture