First attempt at write
Merge branch 'master' of https://github.com/jjaquinta/StarMade.git

Conflicts:
	JoFileLibrary/src/jo/sm/data/BlockTypes.java
	JoFileLibrary/src/jo/sm/ship/logic/ShipLogic.java
	JoFileLibrary/src/jo/sm/ui/EditPanel.java
	JoFileLibrary/src/jo/sm/ui/RenderFrame.java