Project Manh
Merge branch 'master' of https://github.com/ribbon-xx/worldcup2014-su1312m

Conflicts:
	.settings/org.eclipse.core.resources.prefs