Commit for VivaDaylight
Merge branch 'master' of https://github.com/Aurilux/ModJam4 into Aurilux-master

Conflicts:
	common/com/vivalux/cyb/Cybernetica.java
	common/com/vivalux/cyb/block/BlockIntegrationTable.java
	common/com/vivalux/cyb/handler/GuiHandler.java

common/com/vivalux/cyb/inventory/container/ContainerIntegrationTable.jav
a
Merge pull request #4 from VivaDaylight3/Aurilux-master

Aurilux master