putting these to the side for a minute
Merge branch 'master' of github.com:OpenMods/OpenBlocks

Conflicts:
	src/openblocks/client/gui/component/GuiComponentSideSelector.java
	src/openblocks/common/container/ContainerVacuumHopper.java
	src/openblocks/common/tileentity/TileEntityVacuumHopper.java