Merge branch 'release/v2.1.3' into develop
modded new button scaffolding for better control over buttons
upped version number to v2.1.4
Merge branch 'release/v2.1.4'