Merge branch 'next'

Conflicts:
	org.lamport.tla.toolbox.product.product/org.lamport.tla.toolbox.product.product.product
	org.lamport.tla.toolbox.product.standalone/plugin.xml
	org.lamport.tla.toolbox/src/org/lamport/tla/toolbox/ui/view/ToolboxWelcomeView.java
	tlatools/src/tlc2/tool/fp/MSBDiskFPSet.java
	tlatools/test/tlc2/tool/fp/MSBDiskFPSetTest2.java