Set database_ondo config
Merge remote-tracking branch 'kaduna/master' into test
clean up repository
fixed .gitslave error
public_display_listing, changed the columns on display
Merge remote-tracking branch 'solakaduna/master' into appo

Conflicts:
	.gitslave