javadoc
Merge branch 'master' of github.com:d-cam/definitiu

Conflicts:
	capaPresentacion/introduccionManual.java