Class domain
Merge branch 'develop' of https://github.com/tncgroup/stsrepo into develop