Merge branch 'release/1.2.1' into develop
Merge branch 'hotfix/str_error_fix' into develop
Merge branch 'master' into develop
Reorganized import statements
Added spaces between defs/classes
Added an input/raw_input py23 compatibility function, added to setuphelp
Updated version
Merge branch 'release/1.2.2'