???
Merge branch 'master' of https://github.com/IggyIguana/exonian

Conflicts:
	bin/Exonian.apk
	bin/classes.dex