Fixed Forestry GUI reversions.
Fixed Biomes O Plenty spring water conversion.
Merge branch 'Leenhaart/master'