From Donga
From DOng 2
Merge branch 'master' of https://github.com/ribbon-xx/worldcup2014-su1312m

Conflicts:
	.settings/org.eclipse.core.resources.prefs
	src/bkapt/su1312m/WorldCup2014/Dudoan.java

Signed-off-by: dongtx <xuandong.khmt1k5@gmail.com>