supplies.png now has pictures for all supplies
Supplies are now spawned correctly
Javadoc
Merge remote-tracking branch 'origin/CallebergBranch' into cbmerge