Added to mainGui and added the ObjectListView to the project
Merge Fix?
Merge branch 'dev' of https://github.com/Castronova/EMIT into dev

Conflicts:
	gui/mainGui.py