20140129 2
201408022352
Merge branch 'master' of git@github.com:sidneyzhang/myspring.git

Conflicts:
	src/main/java/com/sidney/myspring/service/impl/SInventoryServiceImpl.java