mi
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	bin/Evocate.apk
	bin/R.txt
	bin/classes.dex
	bin/resources.ap_
	res/values/strings.xml
p

pp
[
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	bin/Evocate.apk
	bin/R.txt
	bin/classes.dex
	bin/resources.ap_
	res/values/strings.xml