init
Merge branch 'master' of https://github.com/dempeZheng/analysis-web

Conflicts:
	analysis-core/src/main/java/com/dempe/analysis/core/Constants.java