GitLab

# Conflicts:
#	__main__.py
#	analysis/datastats.py
#	dataset.py
#	detectionview.py
#	sampleview.py
#	viewitems.py

# fixed a lot of other relative import bugs