Roll back due to mem error
Merge branch 'my-temporary-work'

Conflicts:
	common/FinancialExpansion.java
	common/OreGeneration.java
Merge branch 'master' of https://github.com/thebuildcast/modjam3

Conflicts:
	common/BlockCoinPress.java
	common/FinancialExpansion.java
	common/GuiCoinPress.java