Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Account/src/controller/Controller.java

	Resuelto algunos conflictos de Merge.