CLSN-1980 pincode screen rewrite
Merge branch 'master' of https://github.com/algosystech/collosys
CLSN-1992 Settlement -Payment screen not working