Prepping for 2.0 release
Merge branch 'master' of https://github.com/bau5/ProjectBench

Conflicts:
	bau5/mods/projectbench/common/ProjectBench.java