commit
Merge branch 'master' of https://github.com/luitgy/Deliverum.git

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