some
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/plugins/LowerCompletePlugin.java
	src/plugins/WatershedPlugin.java
int, regr