123
Merge remote-tracking branch 'upstream/master'
data
data
Merge remote-tracking branch 'upstream/master'
data
Merge branch 'master' of https://github.com/LiLane/SevenWonders

Conflicts:
	src/org/tjuscs/sevenwonders/kernel/Board.java
2014071801
Merge branch 'master' of https://github.com/LiLane/SevenWonders

Conflicts:
	src/org/tjuscs/sevenwonders/gui/MainBackGround.java
	src/org/tjuscs/sevenwonders/gui/Wonders.java
2014071802
Merge pull request #2 from wanting721/master

Discard