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

Conflicts:
	AndroidManifest.xml
	src/bkapt/su1312m/WorldCup2014/Login.java