xiugai
Signed-off-by: jinyu.yin <jinyu.yin@dianping.com>
Signed-off-by: jinyu.yin <jinyu.yin@dianping.com>
Merge branch 'master' of github.com:dmccer/kuaidai

Conflicts:
	weixin-callbacksite/src/main/java/com/windeagle/kuaidai/controller/BaseController.java
	weixin-callbacksite/src/main/java/com/windeagle/kuaidai/controller/ProductController.java
	weixin-callbacksite/src/main/java/com/windeagle/weixin/callbacksite/servlet/ApplicationContextProvider.java
	weixin-callbacksite/src/main/webapp/home.html