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

Conflicts:
	src/bkapt/su1312m/WorldCup2014/Adapters/TabsPagerAdapter.java
	src/bkapt/su1312m/WorldCup2014/Adapters/TodayTVAdapter.java
	src/bkapt/su1312m/WorldCup2014/Fragment/AllMatchesFragment.java
	src/bkapt/su1312m/WorldCup2014/Fragment/ToDayTVFragment.java
	src/bkapt/su1312m/WorldCup2014/Utils/ServiceConfig.java