Merge branch 'syf-scale1220' of http://192.168.2.236:10080/zhouna/preliminary into syf-scale1220

# Conflicts:
#	src/components/PathInfo.vue