Merge origin/master

Conflicts:
	FlowChange/src/flowchange/GUI/FlowChangeGUI.java