changed a few methods to private.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	uDo_data.txt