Merge origin/master

Conflicts:
	src/main/java/bolsa_web/model/Operacao.java