Merge branch 'bugFix' into development
Merge branch 'master' into development
bug fix 2 main activities.
Improved PIN input.
Relayount and keyboard fix.
Format values and align right.
Merge branch 'development'