Update display and database

hoi
Merge branch 'master' of https://github.com/Willempie/Artificial_Intelligence_Cube

Conflicts:
	cubegui.py
	object_visual/v_display.py