Merged master. Will work on this this weekend
Merge remote-tracking branch 'origin/wip/tracker-lists' into wip/indev

Conflicts:
	src/Core.cpp
debug