种猪信息
Merge remote-tracking branch 'origin/master'
#提交种猪信息
Conflicts:
	src/com/lovepig/engine/PriceEngine.java
	src/com/lovepig/main/Application.java
	src/com/lovepig/view/OnlineNewsDetailsView.java
commit boar