Gradle android project
Merge branch 'master' of github.com:xylochylo/MobAudio

Conflicts:
	android/.idea/copyright/profiles_settings.xml
	android/.idea/workspace.xml
	android/src/com/example/android/MyActivity.java
	android/src/com/example/android/service/HostManager.java