Merge branch 'pv162_watershed_new_visualization' of...

Merge branch 'pv162_watershed_new_visualization' of gitlab.fi.muni.cz:cbia/maphis into pv162_watershed_new_visualization

# Conflicts:
#	maphis/plugins/maphis/tools/interactive_segmentation.py