Merge branch 'master' of https://github.com/sgdoc/sgdoc-codigo into sgdoc-master

Conflicts:
	cfg/configuration.ini
	classes/Config.php

Signed-off-by: Elio Jose Gavlinski Junior - SUPDE/DEPAE/DE009