Initial Standards merge

We need to merge at least these changes into develop because the guiConstraints.py has been separated into different files and keeps causing a lot of merge conflicts.