updated gui
Merge branch 'master' of https://github.com/michael1991j/MriSegment

Conflicts:
	src/.metadata/.log
	src/MRIPCL/CartilageOperation.cpp
	src/MRIPCL/PatellaOperation.cpp