Merge remote-tracking branch 'Diego/master'

Conflicts:
	bd/all/init/init_objects_dba_system.sql
	bd/all/init/init_security.sql
Merge remote-tracking branch 'Diego/master'

Conflicts:
	bd/all/init/init_objects_dba_system.sql
	bd/all/init/init_security.sql
.
Merge remote-tracking branch 'David/master'

Conflicts:
	protected/runtime/application.log