Merge remote-tracking branch 'origin/master'

Conflicts:
	src/static/graficos/grafo.png
Merge remote-tracking branch 'origin/master'