Merge origin/master

Conflicts:
	WarLOTR/src/gui/MenuPrincipal.java
	WarLOTR/src/gui/Som.java
Merge origin/master

Conflicts:
	WarLOTR/src/gui/MenuPrincipal.java
	WarLOTR/src/gui/Som.java