Merge branch 'master' of github.com:qbright/VisualizationFis

Conflicts:
	src/fis_/js/common.js
	src/fis_/js/index.js
	src/fis_/js/install.js
	src/fis_/js/main.js
	src/fis_/settings.json

Signed-off-by: zqbright <zqbright@gmail.com>
Merge branch 'master' of github.com:qbright/VisualizationFis

Conflicts:
	src/fis_/js/common.js
	src/fis_/js/index.js
	src/fis_/js/install.js
	src/fis_/js/main.js
	src/fis_/settings.json

Signed-off-by: zqbright <zqbright@gmail.com>