push obligatorio

-eliminados algunos archivos xml.
Merge branch 'master' of https://github.com/Albertpa/Rodalies-v0.1

Conflicts:
	.gradle/1.10/taskArtifacts/cache.properties.lock
	.gradle/1.10/taskArtifacts/fileHashes.bin
	.idea/libraries/ComAndroidSupportAppcompatV71901_aar.xml
	.idea/libraries/Gradle__ComAndroidSupportAppcompatV71901_aar.xml
	.idea/workspace.xml
2o commit obligatorio