Merge branch 'dev' into zoom
zoom working as it should be, wicked
Merge branch 'zoom' into dev
Merge branch 'dev' into cli
add some info to print & adjusted print times
Merge branch 'cli' into dev
Merge branch 'dev' into commonclient
ge_client quits if a step () returns "quit"
Merge branch 'commonclient' into dev
Merge branch 'dev'