commit
Merge branch 'master' of https://github.com/szmitas/zpi-mobile
up
Merge branch 'master' of https://github.com/szmitas/zpi-mobile

Conflicts:
	bin/classes.dex