Merge origin/master

Conflicts:
	src/main/java/gui/ventanas/FventanaIncial.java
Merge origin/master
Merge origin/master

Conflicts:
	src/main/java/gui/ventanas/FventanaIncial.java