Christian 'ketura' McCarty
a7e9fa03ca
Merge branch 'master' into v2-cards
# Conflicts:
# gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java
# gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/PC_Cards.js
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-shire.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set19/set19.hjson
# gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_shire.hjson