nocommit
Merge https://github.com/ribbon-xx/worldcup2014-su1312m

Conflicts:
	.idea/libraries/libs.xml
	.idea/misc.xml
	.idea/workspace.xml