@wangjian
Merge branch 'master' of https://github.com/wangjian161/DistributionSystem

Conflicts:
	Distribution/src/com/wireless/distribution/utils/UrlUtils.java
@wangjian