Fixed to conform to changes in AlloSystem
Merge branch 'master' of github.com:AlloSphere-Research-Group/AlloProject