Worked on almost everything
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/walrushunter7/war/blocks/AISpawnerBlock.java
	src/main/java/com/walrushunter7/war/blocks/AISpawnerTile.java