hey

hey
Merge branch 'master' of https://github.com/dragon-fury/Vol-U-Me

Conflicts:
	AndroidManifest.xml
	bin/jarlist.cache
	res/values/strings.xml