BinaryExerciseFragment añadido
Copio mi FragmentFactory actual
Merge remote-tracking branch 'upstream_enol/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/es/uniovi/imovil/fcrtrainer/FragmentFactory.java
parte de entrenamiento
Creado Fragmento de Mascara de red, Añadido Layout y modificado Frag.
Fact
lint.xml eleminado.
eleminar lint.xml
Add images
Merge branch 'master' of https://github.com/enoler/imovil2014.git
Merge remote-tracking branch 'origin/walter' into walter

Conflicts:
	res/values-en/strings.xml
	res/values/strings.xml
	src/es/uniovi/imovil/fcrtrainer/FragmentFactory.java
Walter
Walter
Merge branch 'master' into walter
Añadida clase y layout de máscara de red
Merge remote-tracking branch 'upstream-enol/master'

Conflicts:
	res/layout/fragmen_logic_operation.xml
	res/values-en/strings.xml
	res/values/strings.xml
	src/es/uniovi/imovil/fcrtrainer/LogicOperationExerciseFragment.java
properties