-fix bug
Merge branch 'master' of git@github.com:smartcampuslab/smartcampus.mediation.git