update
Merge branch 'master' of https://github.com/Znow/wenesto

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