test
Merge branch 'master' of https://github.com/itcongithub/SmartConfPhase-1