Inicial
0.2
Merge branch 'master' into CarlosYubero
Merge remote-tracking branch 'origin/CarlosYubero' into Miguel

Conflicts:
	BookCamp/src/Imagenes/Search.png
	BookCamp/src/Pantallas/JMenuBarBackgroundDemo.java