design update
Merge branch 'design-v4'
Merge branch 'master' of https://github.com/jcgasche/payonesnap