Merge branch 'master' of http://121.37.83.100:3000/sooka_onest/sooka_onest_forestfire_vue2_visualization

# Conflicts:
#	src/views/datacenter.vue

src/components/vBottomMenu.vue

@@ -43,6 +43,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
 	@import '@/assets/styles/base.scss';
+	
 	.bottom-menu-normal {
 		max-width: 90%;
 		padding: 0 3rem;