commit so i can sync
Merge branch 'master' of https://github.com/mvr05083/PicoInvoices

Conflicts:
	picoinvoices/bin/picoinvoices.apk
	picoinvoices/bin/resources.ap_