irving
Merge origin/master
irving
Merge origin/master

Conflicts:
	DisPaper/src/Vista/Tras.form
	DisPaper/src/Vista/Tras.java
Merge origin/master

Conflicts:
	DisPaper/src/Vista/Tras.form
	DisPaper/src/Vista/Tras.java