update
Merge branch 'master' of github.com:zzjove/PinPeng

Conflicts:
	PinPeng/WebRoot/WEB-INF/classes/struts.xml
	PinPeng/src/struts.xml