Memory Viewer Configuration
Merge remote-tracking branch 'origin/master'

Conflicts:
	mainwindow.cpp
	memorymodel.cpp