Merge pull request #496 from Krapht/master

Remove a SideOnly that crashes server
Updated FML:
MinecraftForge/FML@8b8837c9ff635d4988e0a1504fca38667825daf0 Fix NPE when branding isn't present