BAM!
Merge branch 'master' of https://github.com/Emerican/Shroom

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/Shroom.apk
	bin/classes.dex
	bin/resources.ap_