test
test
test
test
Merge branch 'master' of
https://github.com/2slamppe-eq7/gestageandroid.git

Conflicts:
	bin/Gestage.apk
	bin/classes.dex
	bin/resources.ap_