stop discovery on when returning to main activity from discover jam activity
Updated javadoc for MainActivity and other minor changes.