Merge branch 'basicConstitutionSupport' into develop

z
Merge branch 'master' of https://github.com/Mussie1/SWiFTfososc