Local commit
Merge remote-tracking branch 'origin/master'
Changed a bunch of AWT lists to JLists. GUI updates consistently now.