kot java
Merge branch 'master' of https://github.com/bfoz-zpi/zpi.git

Conflicts:
	zpi-lotto/src/com/bfoz/zpi/lotto/fragments/CouponFragment.java
	zpi-lotto/src/com/bfoz/zpi/lotto/parsers/OCRParser2.java