Modo entrenamiento del modulo de complemento a dos
Merge remote-tracking branch 'Enol/master'

Conflicts:
	res/values-en/strings.xml
	res/values/arrays.xml
	res/values/strings.xml
	src/es/uniovi/imovil/fcrtrainer/FragmentFactory.java
Arreglo de project properties
Arreglo project properties 2
Merge pull request #34 from UO216989/master

modo entrenamiento complemento a dos