Cleaned up some code
Merge branch 'master' of https://github.com/OneSoundApp/OneSound

Conflicts:
	app/src/main/java/com/onesound/UI/MainActivity.java