DeckBuilder nearly complete
Merge branch 'javafx' of https://github.com/Cardshifter/Cardshifter into javafx

Conflicts:

cardshifter-fx/src/main/java/com/cardshifter/client/DeckBuilderWindow.ja
va