Merge pull request #5 from copygirl/master

Add Thermal Expansion support
Fix NPE?
Merge remote-tracking branch 'upstream/master'

Conflicts:
	stanhebben/minetweaker/mods/te/ThermalExpansionUtil.java