discover mob
Merge branch 'master' of github.com:xylochylo/MobAudio

Conflicts:
	android/src/com/example/android/ui/DiscoverMobFragment.java