Merge branch 'master' of https://github.com/tenoritaiga/SmartCity2.git
Merge branch 'master' of https://github.com/tenoritaiga/SmartCity2.git