Added boss, and spawn updates
Merge remote-tracking branch 'origin/master'