merge
Merge remote-tracking branch 'David/master'

Conflicts:
	bd/all/init/init_objects_dba_system.sql
	bd/all/init/init_security.sql
	protected/runtime/application.log.orig
Merge remote-tracking branch 'Rafael/master'

Conflicts:
	bd/pt/creditos/pk_creditos_bod.sql
	bd/pt/creditos/pk_creditos_bod.sql.orig
Merge remote-tracking branch 'Rafael/master'

Conflicts:
	bd/all/init/init_objects_dba_system.sql
	bd/all/init/init_security.sql
	bd/pt/creditos/pk_creditos_bod.sql
.