配置发布路径
Merge branch 'master' of https://github.com/jldaren/urgent-project
增加ajax调用wicket的例子
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules.core/core-web-resources/src/main/resources/custome/gis/js/map/map.js