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

Conflicts:
	bin/classes.dex