Merge branch 'firstview'
Merge branch 'master' of https://github.com/briceeeee/jomcity