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