Merge branch 'javafx' of github.com:Cardshifter/Cardshifter into ai
Merge branch 'ai' of github.com:Cardshifter/Cardshifter into client-server