#853 Incorrect icons for reservoir
Merge branch 'master' of https://github.com/CrazyPants/EnderIO.git

Conflicts:
	src/main/java/crazypants/enderio/machine/reservoir/BlockReservoir.java