Prueba ws
Merge branch 'master' of https://github.com/erickcsh/WorldCup2014

Conflicts:
	AndroidManifest.xml
	libs/android-support-v4.jar
	project.properties
	res/layout/activity_main.xml
	res/menu/main.xml
	res/values-v11/styles.xml
	res/values-v14/styles.xml
	res/values/strings.xml
	res/values/styles.xml