增加spring 4.0框架支持
Signed-off-by: yewenqu <yewenqu1@hotmail.com>
Merge branch 'v1.0.1' of https://github.com/iacdingping/shanglvka.git
into v1.0.1

Conflicts:
	shanglvka-wap/pom.xml