Merge origin/master

Conflicts:
	ger/topico/manut_topico.js