Merge branch 'bugHuntAsm2018' into 'master'

EJBException not found & nullpointerexception  while changing user cards

See merge request !383

code/moya-beans/ejbModule/fi/codecrew/moya/beans/CardTemplateBean.java

@@ -171,7 +171,7 @@ public class CardTemplateBean implements CardTemplateBeanLocal {
 
 		PrintedCard biggestCard = null;
 		for (PrintedCard card : myCards) {
-			if (card.getEnabled() && biggestCard == null || biggestCard.getTemplate().getPower() < card.getTemplate().getPower()) {
+			if (card.getEnabled() && (biggestCard == null || biggestCard.getTemplate().getPower() < card.getTemplate().getPower())) {
 				// The biggest card should be the only one enabled.
 				if (biggestCard != null) {
 					biggestCard.setEnabled(false);