edit checking
Merge branch 'master' of https://github.com/gigsth/gisiph

Conflicts:
	dist/js/analysis.js
edit cal color
Merge branch 'master' of https://github.com/gigsth/gisiph