rikoin ui:n, toisin tuon default, insomnia ui ok.

Petri Järvisalo
Commit 55dbaf86 authored Oct 07, 2012 by Petri Järvisalo
Showing with 1140 additions and 1082 deletions
code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessageResponse_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessage_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/ApplicationPermission_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardTemplate_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryFile_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntry_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Compo_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/DiscountInstance_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/Discount_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EntityEquals_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventOrganiser_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventUser_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave_.java
code/LanBortalDatabase/src/fi/insomnia/bortal/model/GenericEntity_.java
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/AccountEvent_.java
 package fi.insomnia.bortal.model;
 import java.math.BigDecimal;
 import java.util.Calendar;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.827+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.709+0300")
 @StaticMetamodel(AccountEvent.class)
 public class AccountEvent_ extends GenericEntity_ {
 	public static volatile SingularAttribute<AccountEvent, Boolean> cash;
 	public static volatile SingularAttribute<AccountEvent, BigDecimal> unitPrice;
 	public static volatile SingularAttribute<AccountEvent, BigDecimal> quantity;
 	public static volatile SingularAttribute<AccountEvent, Calendar> eventTime;
 	public static volatile SingularAttribute<AccountEvent, Calendar> delivered;
 	public static volatile SingularAttribute<AccountEvent, FoodWave> foodWave;
 	public static volatile SingularAttribute<AccountEvent, Product> product;
 	public static volatile SingularAttribute<AccountEvent, EventUser> user;
 	public static volatile SingularAttribute<AccountEvent, EventUser> seller;
 	public static volatile ListAttribute<AccountEvent, DiscountInstance> discountInstances;
 	public static volatile SingularAttribute<AccountEvent, Bill> bill;
 	public static volatile SingularAttribute<AccountEvent, String> description;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessageResponse_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessageResponse_.java
 package fi.insomnia.bortal.model;
 import fi.insomnia.bortal.enums.ActionLogMessageState;
 import java.util.Date;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.843+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.771+0300")
 @StaticMetamodel(ActionLogMessageResponse.class)
 public class ActionLogMessageResponse_ extends GenericEntity_ {
 	public static volatile SingularAttribute<ActionLogMessageResponse, Date> time;
 	public static volatile SingularAttribute<ActionLogMessageResponse, EventUser> user;
 	public static volatile SingularAttribute<ActionLogMessageResponse, String> message;
 	public static volatile SingularAttribute<ActionLogMessageResponse, ActionLogMessageState> stateChange;
 	public static volatile SingularAttribute<ActionLogMessageResponse, ActionLogMessage> actionLogMessage;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessage_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/ActionLogMessage_.java
 package fi.insomnia.bortal.model;
 import fi.insomnia.bortal.enums.ActionLogMessageState;
 import java.util.Date;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.836+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.752+0300")
 @StaticMetamodel(ActionLogMessage.class)
 public class ActionLogMessage_ extends GenericEntity_ {
 	public static volatile SingularAttribute<ActionLogMessage, Date> time;
 	public static volatile SingularAttribute<ActionLogMessage, User> user;
 	public static volatile SingularAttribute<ActionLogMessage, Role> crew;
 	public static volatile SingularAttribute<ActionLogMessage, String> message;
 	public static volatile ListAttribute<ActionLogMessage, ActionLogMessageResponse> actionLogMessageResponses;
 	public static volatile SingularAttribute<ActionLogMessage, ActionLogMessageState> state;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/ApplicationPermission_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/ApplicationPermission_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.849+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.785+0300")
 @StaticMetamodel(ApplicationPermission.class)
 public class ApplicationPermission_ extends GenericEntity_ {
 	public static volatile SingularAttribute<ApplicationPermission, String> application;
 	public static volatile SingularAttribute<ApplicationPermission, Role> role;
 	public static volatile SingularAttribute<ApplicationPermission, String> permission;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/BillLine_.java
 package fi.insomnia.bortal.model;
 import java.math.BigDecimal;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.862+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.831+0300")
 @StaticMetamodel(BillLine.class)
 public class BillLine_ extends GenericEntity_ {
 	public static volatile SingularAttribute<BillLine, Bill> bill;
 	public static volatile SingularAttribute<BillLine, String> name;
 	public static volatile SingularAttribute<BillLine, BigDecimal> quantity;
 	public static volatile SingularAttribute<BillLine, BigDecimal> unitPrice;
 	public static volatile SingularAttribute<BillLine, String> unitName;
 	public static volatile SingularAttribute<BillLine, BigDecimal> vat;
 	public static volatile SingularAttribute<BillLine, Product> lineProduct;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Bill_.java
 package fi.insomnia.bortal.model;
 import java.util.Calendar;
 import java.util.Date;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.855+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.803+0300")
 @StaticMetamodel(Bill.class)
 public class Bill_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Bill, LanEvent> event;
 	public static volatile SingularAttribute<Bill, Date> paidDate;
 	public static volatile SingularAttribute<Bill, Integer> billNumber;
 	public static volatile SingularAttribute<Bill, String> addr1;
 	public static volatile SingularAttribute<Bill, String> addr2;
 	public static volatile SingularAttribute<Bill, String> addr3;
 	public static volatile SingularAttribute<Bill, String> addr4;
 	public static volatile SingularAttribute<Bill, String> addr5;
 	public static volatile SingularAttribute<Bill, Calendar> sentDate;
 	public static volatile SingularAttribute<Bill, Integer> paymentTime;
 	public static volatile SingularAttribute<Bill, String> noticetime;
 	public static volatile SingularAttribute<Bill, String> theirReference;
 	public static volatile SingularAttribute<Bill, String> ourReference;
 	public static volatile SingularAttribute<Bill, String> deliveryTerms;
 	public static volatile SingularAttribute<Bill, Integer> delayIntrest;
 	public static volatile SingularAttribute<Bill, String> notes;
 	public static volatile ListAttribute<Bill, BillLine> billLines;
 	public static volatile SingularAttribute<Bill, AccountEvent> accountEvent;
 	public static volatile SingularAttribute<Bill, EventUser> user;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardTemplate_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardTemplate_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.868+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.842+0300")
 @StaticMetamodel(CardTemplate.class)
 public class CardTemplate_ extends GenericEntity_ {
 	public static volatile SingularAttribute<CardTemplate, LanEvent> event;
 	public static volatile SingularAttribute<CardTemplate, byte[]> image;
 	public static volatile SingularAttribute<CardTemplate, String> name;
 	public static volatile SingularAttribute<CardTemplate, Integer> power;
 	public static volatile ListAttribute<CardTemplate, Role> roles;
 	public static volatile ListAttribute<CardTemplate, PrintedCard> cards;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryFile_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryFile_.java
 package fi.insomnia.bortal.model;
 import java.util.Calendar;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.892+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.916+0300")
 @StaticMetamodel(CompoEntryFile.class)
 public class CompoEntryFile_ extends GenericEntity_ {
 	public static volatile SingularAttribute<CompoEntryFile, String> mimeType;
 	public static volatile SingularAttribute<CompoEntryFile, String> fileName;
 	public static volatile SingularAttribute<CompoEntryFile, String> description;
 	public static volatile SingularAttribute<CompoEntryFile, String> hash;
 	public static volatile SingularAttribute<CompoEntryFile, byte[]> fileData;
 	public static volatile SingularAttribute<CompoEntryFile, Calendar> uploaded;
 	public static volatile SingularAttribute<CompoEntryFile, CompoEntry> entry;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntryParticipant_.java
 package fi.insomnia.bortal.model;
 import java.util.Calendar;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.899+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.933+0300")
 @StaticMetamodel(CompoEntryParticipant.class)
 public class CompoEntryParticipant_ extends GenericEntity_ {
 	public static volatile SingularAttribute<CompoEntryParticipant, CompoEntry> entry;
 	public static volatile SingularAttribute<CompoEntryParticipant, String> role;
 	public static volatile SingularAttribute<CompoEntryParticipant, String> nick;
 	public static volatile SingularAttribute<CompoEntryParticipant, Calendar> confirmed;
 	public static volatile SingularAttribute<CompoEntryParticipant, EventUser> user;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntry_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/CompoEntry_.java
 package fi.insomnia.bortal.model;
 import java.util.Calendar;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.883+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.896+0300")
 @StaticMetamodel(CompoEntry.class)
 public class CompoEntry_ extends GenericEntity_ {
 	public static volatile SingularAttribute<CompoEntry, Compo> compo;
 	public static volatile SingularAttribute<CompoEntry, Calendar> created;
 	public static volatile SingularAttribute<CompoEntry, String> title;
 	public static volatile SingularAttribute<CompoEntry, String> author;
 	public static volatile SingularAttribute<CompoEntry, String> notes;
 	public static volatile SingularAttribute<CompoEntry, String> screenMessage;
 	public static volatile SingularAttribute<CompoEntry, Integer> sort;
 	public static volatile SingularAttribute<CompoEntry, Integer> finalPosition;
 	public static volatile SingularAttribute<CompoEntry, CompoEntryFile> currentFile;
 	public static volatile ListAttribute<CompoEntry, Vote> votes;
 	public static volatile ListAttribute<CompoEntry, CompoEntryFile> files;
 	public static volatile ListAttribute<CompoEntry, CompoEntryParticipant> participants;
 	public static volatile SingularAttribute<CompoEntry, EventUser> creator;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Compo_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Compo_.java
 package fi.insomnia.bortal.model;
 import java.util.Calendar;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.874+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.873+0300")
 @StaticMetamodel(Compo.class)
 public class Compo_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Compo, String> name;
 	public static volatile SingularAttribute<Compo, LanEvent> event;
 	public static volatile SingularAttribute<Compo, Calendar> startTime;
 	public static volatile SingularAttribute<Compo, Calendar> endTime;
 	public static volatile SingularAttribute<Compo, Calendar> voteStart;
 	public static volatile SingularAttribute<Compo, Calendar> voteEnd;
 	public static volatile SingularAttribute<Compo, Calendar> submitStart;
 	public static volatile SingularAttribute<Compo, Calendar> submitEnd;
 	public static volatile SingularAttribute<Compo, String> description;
 	public static volatile SingularAttribute<Compo, Integer> maxParticipantCount;
 	public static volatile SingularAttribute<Compo, Boolean> holdVoting;
 	public static volatile ListAttribute<Compo, CompoEntry> compoEntries;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/DiscountInstance_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/DiscountInstance_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.914+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.966+0300")
 @StaticMetamodel(DiscountInstance.class)
 public class DiscountInstance_ extends GenericEntity_ {
 	public static volatile SingularAttribute<DiscountInstance, AccountEvent> accountEvent;
 	public static volatile SingularAttribute<DiscountInstance, Discount> discount;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Discount_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Discount_.java
 package fi.insomnia.bortal.model;
 import java.math.BigDecimal;
 import java.util.Calendar;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.906+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.950+0300")
 @StaticMetamodel(Discount.class)
 public class Discount_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Discount, LanEvent> event;
 	public static volatile SingularAttribute<Discount, BigDecimal> percentage;
 	public static volatile SingularAttribute<Discount, String> code;
 	public static volatile SingularAttribute<Discount, Calendar> validFrom;
 	public static volatile SingularAttribute<Discount, Calendar> validTo;
 	public static volatile SingularAttribute<Discount, String> details;
 	public static volatile SingularAttribute<Discount, String> shortdesc;
 	public static volatile SingularAttribute<Discount, BigDecimal> amountMin;
 	public static volatile SingularAttribute<Discount, BigDecimal> amountMax;
 	public static volatile SingularAttribute<Discount, Boolean> active;
 	public static volatile SingularAttribute<Discount, BigDecimal> maxNum;
 	public static volatile SingularAttribute<Discount, BigDecimal> perUser;
 	public static volatile SingularAttribute<Discount, BigDecimal> totalCount;
 	public static volatile ListAttribute<Discount, DiscountInstance> discountInstances;
 	public static volatile SingularAttribute<Discount, Role> role;
 	public static volatile ListAttribute<Discount, Product> products;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/EntityEquals_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/EntityEquals_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.921+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:34.985+0300")
 @StaticMetamodel(EntityEquals.class)
 public class EntityEquals_ {
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventMap_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.927+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.002+0300")
 @StaticMetamodel(EventMap.class)
 public class EventMap_ extends GenericEntity_ {
 	public static volatile SingularAttribute<EventMap, LanEvent> event;
 	public static volatile SingularAttribute<EventMap, byte[]> mapData;
 	public static volatile SingularAttribute<EventMap, String> name;
 	public static volatile ListAttribute<EventMap, Place> places;
 	public static volatile ListAttribute<EventMap, Reader> readers;
 	public static volatile SingularAttribute<EventMap, Boolean> active;
 	public static volatile SingularAttribute<EventMap, String> notes;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventOrganiser_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventOrganiser_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.934+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.013+0300")
 @StaticMetamodel(EventOrganiser.class)
 public class EventOrganiser_ extends GenericEntity_ {
 	public static volatile SingularAttribute<EventOrganiser, String> organisation;
 	public static volatile SingularAttribute<EventOrganiser, String> bundleCountry;
 	public static volatile ListAttribute<EventOrganiser, LanEvent> events;
 	public static volatile SingularAttribute<EventOrganiser, String> billAddress1;
 	public static volatile SingularAttribute<EventOrganiser, String> billAddress2;
 	public static volatile SingularAttribute<EventOrganiser, String> billAddress3;
 	public static volatile SingularAttribute<EventOrganiser, String> billAddress4;
 	public static volatile SingularAttribute<EventOrganiser, String> bankNumber1;
 	public static volatile SingularAttribute<EventOrganiser, String> bankNumber2;
 	public static volatile SingularAttribute<EventOrganiser, String> bankName1;
 	public static volatile SingularAttribute<EventOrganiser, String> bankName2;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventUser_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/EventUser_.java
 package fi.insomnia.bortal.model;
 import java.util.Date;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.940+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.034+0300")
 @StaticMetamodel(EventUser.class)
 public class EventUser_ extends GenericEntity_ {
 	public static volatile SingularAttribute<EventUser, User> user;
 	public static volatile SingularAttribute<EventUser, LanEvent> event;
 	public static volatile ListAttribute<EventUser, Vote> votes;
 	public static volatile ListAttribute<EventUser, UserNote> notes;
 	public static volatile ListAttribute<EventUser, Role> roles;
 	public static volatile ListAttribute<EventUser, CompoEntryParticipant> compoEntryParticipants;
 	public static volatile ListAttribute<EventUser, CompoEntry> compoEntries;
 	public static volatile ListAttribute<EventUser, PlaceGroup> placeGroups;
 	public static volatile ListAttribute<EventUser, GroupMembership> groupMemberships;
 	public static volatile ListAttribute<EventUser, Place> currentPlaces;
 	public static volatile ListAttribute<EventUser, PrintedCard> printedCards;
 	public static volatile ListAttribute<EventUser, AccountEvent> accountEvents;
 	public static volatile ListAttribute<EventUser, Bill> bills;
 	public static volatile ListAttribute<EventUser, AccountEvent> soldItems;
 	public static volatile ListAttribute<EventUser, PollAnswer> pollAnswers;
 	public static volatile SingularAttribute<EventUser, EventUser> creator;
 	public static volatile SingularAttribute<EventUser, Date> eventuserCreated;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWaveTemplate_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.953+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.056+0300")
 @StaticMetamodel(FoodWaveTemplate.class)
 public class FoodWaveTemplate_ extends GenericEntity_ {
 	public static volatile SingularAttribute<FoodWaveTemplate, LanEvent> event;
 	public static volatile SingularAttribute<FoodWaveTemplate, String> name;
 	public static volatile SingularAttribute<FoodWaveTemplate, String> description;
 	public static volatile ListAttribute<FoodWaveTemplate, Product> products;
 	public static volatile ListAttribute<FoodWaveTemplate, FoodWave> foodwaves;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave_.java
 package fi.insomnia.bortal.model;
 import java.util.Calendar;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.947+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.046+0300")
 @StaticMetamodel(FoodWave.class)
 public class FoodWave_ extends GenericEntity_ {
 	public static volatile SingularAttribute<FoodWave, String> name;
 	public static volatile SingularAttribute<FoodWave, String> description;
 	public static volatile SingularAttribute<FoodWave, Calendar> time;
 	public static volatile SingularAttribute<FoodWave, Boolean> closed;
 	public static volatile ListAttribute<FoodWave, AccountEvent> accountEvents;
 	public static volatile SingularAttribute<FoodWave, FoodWaveTemplate> template;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/GenericEntity_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/GenericEntity_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.959+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.065+0300")
 @StaticMetamodel(GenericEntity.class)
 public class GenericEntity_ extends EntityEquals_ {
 	public static volatile SingularAttribute<GenericEntity, Integer> id;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/GroupMembership_.java
 package fi.insomnia.bortal.model;
 import java.util.Calendar;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.966+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.078+0300")
 @StaticMetamodel(GroupMembership.class)
 public class GroupMembership_ extends GenericEntity_ {
 	public static volatile SingularAttribute<GroupMembership, String> inviteToken;
 	public static volatile SingularAttribute<GroupMembership, Calendar> inviteAccepted;
 	public static volatile SingularAttribute<GroupMembership, String> inviteEmail;
 	public static volatile SingularAttribute<GroupMembership, String> inviteName;
 	public static volatile SingularAttribute<GroupMembership, PlaceGroup> placeGroup;
 	public static volatile SingularAttribute<GroupMembership, Place> placeReservation;
 	public static volatile SingularAttribute<GroupMembership, EventUser> user;
 	public static volatile SingularAttribute<GroupMembership, Calendar> enteredEvent;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventDomain_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventDomain_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.979+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.115+0300")
 @StaticMetamodel(LanEventDomain.class)
 public class LanEventDomain_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LanEventDomain, String> domain;
 	public static volatile SingularAttribute<LanEventDomain, String> description;
 	public static volatile SingularAttribute<LanEventDomain, LanEvent> event;
 	public static volatile SingularAttribute<LanEventDomain, Integer> overridePriority;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventPrivateProperty_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventPrivateProperty_.java
 package fi.insomnia.bortal.model;
 import java.math.BigDecimal;
 import java.util.Date;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.985+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:15.127+0300")
 @StaticMetamodel(LanEventPrivateProperty.class)
 public class LanEventPrivateProperty_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LanEventPrivateProperty, EventOrganiser> eventorg;
 	public static volatile SingularAttribute<LanEventPrivateProperty, LanEvent> event;
 	public static volatile SingularAttribute<LanEventPrivateProperty, LanEventPrivatePropertyKey> key;
 	public static volatile SingularAttribute<LanEventPrivateProperty, String> description;
 	public static volatile SingularAttribute<LanEventPrivateProperty, Boolean> booleanValue;
 	public static volatile SingularAttribute<LanEventPrivateProperty, String> textvalue;
 	public static volatile SingularAttribute<LanEventPrivateProperty, BigDecimal> decimalValue;
 	public static volatile SingularAttribute<LanEventPrivateProperty, Long> longValue;
 	public static volatile SingularAttribute<LanEventPrivateProperty, String> byteMime;
 	public static volatile SingularAttribute<LanEventPrivateProperty, byte[]> byteValue;
 	public static volatile SingularAttribute<LanEventPrivateProperty, Date> dateValue;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventProperty_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEventProperty_.java
 package fi.insomnia.bortal.model;
 import java.math.BigDecimal;
 import java.util.Date;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.005+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.127+0300")
 @StaticMetamodel(LanEventProperty.class)
 public class LanEventProperty_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LanEventProperty, EventOrganiser> eventorg;
 	public static volatile SingularAttribute<LanEventProperty, LanEvent> event;
 	public static volatile SingularAttribute<LanEventProperty, LanEventPropertyKey> key;
 	public static volatile SingularAttribute<LanEventProperty, String> description;
 	public static volatile SingularAttribute<LanEventProperty, Boolean> booleanValue;
 	public static volatile SingularAttribute<LanEventProperty, String> textvalue;
 	public static volatile SingularAttribute<LanEventProperty, BigDecimal> decimalValue;
 	public static volatile SingularAttribute<LanEventProperty, Long> longValue;
 	public static volatile SingularAttribute<LanEventProperty, String> byteMime;
 	public static volatile SingularAttribute<LanEventProperty, byte[]> byteValue;
 	public static volatile SingularAttribute<LanEventProperty, Date> dateValue;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEvent_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/LanEvent_.java
 package fi.insomnia.bortal.model;
 import fi.insomnia.bortal.enums.EventStatus;
 import fi.insomnia.bortal.model.salespoint.Salespoint;
 import java.util.Calendar;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:54.973+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.088+0300")
 @StaticMetamodel(LanEvent.class)
 public class LanEvent_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LanEvent, Calendar> startTime;
 	public static volatile SingularAttribute<LanEvent, Calendar> endTime;
 	public static volatile SingularAttribute<LanEvent, String> name;
 	public static volatile SingularAttribute<LanEvent, Boolean> eventEnabled;
 	public static volatile SingularAttribute<LanEvent, Integer> referenceNumberBase;
 	public static volatile SingularAttribute<LanEvent, Integer> nextBillNumber;
 	public static volatile SingularAttribute<LanEvent, EventOrganiser> organiser;
 	public static volatile SingularAttribute<LanEvent, EventStatus> status;
 	public static volatile ListAttribute<LanEvent, LogEntry> logEntries;
 	public static volatile SingularAttribute<LanEvent, Role> defaultRole;
 	public static volatile ListAttribute<LanEvent, Compo> compos;
 	public static volatile ListAttribute<LanEvent, CardTemplate> cardTemplates;
 	public static volatile ListAttribute<LanEvent, EventMap> eventMaps;
 	public static volatile ListAttribute<LanEvent, Role> roles;
 	public static volatile ListAttribute<LanEvent, Bill> bills;
 	public static volatile ListAttribute<LanEvent, Reader> readers;
 	public static volatile ListAttribute<LanEvent, Poll> polls;
 	public static volatile ListAttribute<LanEvent, Salespoint> salespoints;
 	public static volatile ListAttribute<LanEvent, LanEventDomain> domains;
 	public static volatile ListAttribute<LanEvent, LanEventProperty> properties;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Location_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Location_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.011+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.138+0300")
 @StaticMetamodel(Location.class)
 public class Location_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Location, LanEvent> event;
 	public static volatile SingularAttribute<Location, String> name;
 	public static volatile ListAttribute<Location, Reader> readers;
 	public static volatile ListAttribute<Location, PrintedCard> printedCardsAtLocation;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntryType_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntryType_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.025+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.159+0300")
 @StaticMetamodel(LogEntryType.class)
 public class LogEntryType_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LogEntryType, String> name;
 	public static volatile SingularAttribute<LogEntryType, String> description;
 	public static volatile ListAttribute<LogEntryType, LogEntry> logEntries;
 	public static volatile SingularAttribute<LogEntryType, Integer> logLevel;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntry_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/LogEntry_.java
 package fi.insomnia.bortal.model;
 import java.util.Calendar;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.018+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.154+0300")
 @StaticMetamodel(LogEntry.class)
 public class LogEntry_ extends GenericEntity_ {
 	public static volatile SingularAttribute<LogEntry, LanEvent> parentEvent;
 	public static volatile SingularAttribute<LogEntry, Calendar> time;
 	public static volatile SingularAttribute<LogEntry, String> description;
 	public static volatile SingularAttribute<LogEntry, LogEntryType> type;
 	public static volatile SingularAttribute<LogEntry, User> user;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/MenuNavigation_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/MenuNavigation_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.038+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.179+0300")
 @StaticMetamodel(MenuNavigation.class)
 public class MenuNavigation_ extends GenericEntity_ {
 	public static volatile SingularAttribute<MenuNavigation, LanEvent> event;
 	public static volatile SingularAttribute<MenuNavigation, String> key;
 	public static volatile SingularAttribute<MenuNavigation, String> header;
 	public static volatile SingularAttribute<MenuNavigation, String> footer;
 	public static volatile SingularAttribute<MenuNavigation, Integer> sort;
 	public static volatile SingularAttribute<MenuNavigation, Boolean> visible;
 	public static volatile SingularAttribute<MenuNavigation, Menuitem> item;
 	public static volatile SingularAttribute<MenuNavigation, SitePage> sitepage;
 	public static volatile SingularAttribute<MenuNavigation, MenuNavigation> parent;
 	public static volatile ListAttribute<MenuNavigation, MenuNavigation> children;
 	public static volatile SingularAttribute<MenuNavigation, String> application;
 	public static volatile SingularAttribute<MenuNavigation, String> permission;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Menuitem_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Menuitem_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.031+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.174+0300")
 @StaticMetamodel(Menuitem.class)
 public class Menuitem_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Menuitem, String> url;
 	public static volatile SingularAttribute<Menuitem, String> description;
 	public static volatile ListAttribute<Menuitem, MenuNavigation> navigations;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/NewsGroup_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/NewsGroup_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.052+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.198+0300")
 @StaticMetamodel(NewsGroup.class)
 public class NewsGroup_ extends GenericEntity_ {
 	public static volatile SingularAttribute<NewsGroup, LanEvent> event;
 	public static volatile SingularAttribute<NewsGroup, String> name;
 	public static volatile SingularAttribute<NewsGroup, String> description;
 	public static volatile SingularAttribute<NewsGroup, Integer> priority;
 	public static volatile SingularAttribute<NewsGroup, Role> writerRole;
 	public static volatile ListAttribute<NewsGroup, News> news;
 	public static volatile ListAttribute<NewsGroup, Role> readerRoles;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/News_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/News_.java
 package fi.insomnia.bortal.model;
 import java.util.Date;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.045+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.193+0300")
 @StaticMetamodel(News.class)
 public class News_ extends GenericEntity_ {
 	public static volatile SingularAttribute<News, String> title;
 	public static volatile SingularAttribute<News, String> body;
 	public static volatile SingularAttribute<News, String> bodyAbstract;
 	public static volatile SingularAttribute<News, Date> publish;
 	public static volatile SingularAttribute<News, Date> expire;
 	public static volatile SingularAttribute<News, EventUser> creator;
 	public static volatile SingularAttribute<News, Integer> priority;
 	public static volatile SingularAttribute<News, NewsGroup> group;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/OrgRole_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/OrgRole_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.059+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.209+0300")
 @StaticMetamodel(OrgRole.class)
 public class OrgRole_ extends GenericEntity_ {
 	public static volatile SingularAttribute<OrgRole, String> name;
 	public static volatile ListAttribute<OrgRole, User> users;
 	public static volatile ListAttribute<OrgRole, OrgRole> parents;
 	public static volatile ListAttribute<OrgRole, OrgRole> children;
 	public static volatile SingularAttribute<OrgRole, EventOrganiser> eventOrganisation;
 	public static volatile SingularAttribute<OrgRole, Boolean> manageOrganisation;
 	public static volatile ListAttribute<OrgRole, Role> eventRoles;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/PageContent_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/PageContent_.java
 package fi.insomnia.bortal.model;
 import java.util.Date;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.066+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.220+0300")
 @StaticMetamodel(PageContent.class)
 public class PageContent_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PageContent, SitePage> sitepage;
 	public static volatile SingularAttribute<PageContent, Integer> sort;
 	public static volatile SingularAttribute<PageContent, String> content;
 	public static volatile SingularAttribute<PageContent, Date> publish;
 	public static volatile SingularAttribute<PageContent, Date> expire;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/PlaceGroup_.java
 package fi.insomnia.bortal.model;
 import java.util.Calendar;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.093+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.246+0300")
 @StaticMetamodel(PlaceGroup.class)
 public class PlaceGroup_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PlaceGroup, Calendar> created;
 	public static volatile SingularAttribute<PlaceGroup, LanEvent> event;
 	public static volatile SingularAttribute<PlaceGroup, Calendar> edited;
 	public static volatile SingularAttribute<PlaceGroup, String> code;
 	public static volatile SingularAttribute<PlaceGroup, String> name;
 	public static volatile SingularAttribute<PlaceGroup, Boolean> active;
 	public static volatile SingularAttribute<PlaceGroup, String> details;
 	public static volatile SingularAttribute<PlaceGroup, EventUser> creator;
 	public static volatile ListAttribute<PlaceGroup, GroupMembership> members;
 	public static volatile ListAttribute<PlaceGroup, Place> places;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Place_.java
 package fi.insomnia.bortal.model;
 import java.util.Calendar;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.075+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.232+0300")
 @StaticMetamodel(Place.class)
 public class Place_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Place, String> description;
 	public static volatile SingularAttribute<Place, String> name;
 	public static volatile SingularAttribute<Place, Integer> mapX;
 	public static volatile SingularAttribute<Place, Integer> mapY;
 	public static volatile SingularAttribute<Place, Integer> width;
 	public static volatile SingularAttribute<Place, Integer> height;
 	public static volatile SingularAttribute<Place, Calendar> releaseTime;
 	public static volatile SingularAttribute<Place, String> details;
 	public static volatile SingularAttribute<Place, String> code;
 	public static volatile SingularAttribute<Place, GroupMembership> placeReserver;
 	public static volatile SingularAttribute<Place, Boolean> buyable;
 	public static volatile SingularAttribute<Place, Boolean> disabled;
 	public static volatile SingularAttribute<Place, PlaceGroup> group;
 	public static volatile SingularAttribute<Place, Role> providesRole;
 	public static volatile SingularAttribute<Place, EventMap> map;
 	public static volatile SingularAttribute<Place, Product> product;
 	public static volatile SingularAttribute<Place, EventUser> currentUser;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollAnswer_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollAnswer_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.110+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.270+0300")
 @StaticMetamodel(PollAnswer.class)
 public class PollAnswer_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PollAnswer, String> answerText;
 	public static volatile SingularAttribute<PollAnswer, Boolean> answerBoolean;
 	public static volatile SingularAttribute<PollAnswer, PossibleAnswer> choice;
 	public static volatile SingularAttribute<PollAnswer, EventUser> user;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollQuestion_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/PollQuestion_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.118+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.275+0300")
 @StaticMetamodel(PollQuestion.class)
 public class PollQuestion_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PollQuestion, Integer> characters;
 	public static volatile SingularAttribute<PollQuestion, Poll> poll;
 	public static volatile ListAttribute<PollQuestion, PossibleAnswer> answers;
 	public static volatile SingularAttribute<PollQuestion, String> question;
 	public static volatile SingularAttribute<PollQuestion, Integer> choices;
 	public static volatile SingularAttribute<PollQuestion, Integer> sort;
 	public static volatile SingularAttribute<PollQuestion, Integer> page;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Poll_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Poll_.java
 package fi.insomnia.bortal.model;
 import java.util.Date;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.102+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.259+0300")
 @StaticMetamodel(Poll.class)
 public class Poll_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Poll, LanEvent> event;
 	public static volatile SingularAttribute<Poll, Date> begin;
 	public static volatile SingularAttribute<Poll, Date> end;
 	public static volatile SingularAttribute<Poll, String> name;
 	public static volatile SingularAttribute<Poll, String> description;
 	public static volatile ListAttribute<Poll, PollQuestion> questions;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/PossibleAnswer_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/PossibleAnswer_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.126+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.292+0300")
 @StaticMetamodel(PossibleAnswer.class)
 public class PossibleAnswer_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PossibleAnswer, String> answer;
 	public static volatile SingularAttribute<PossibleAnswer, Integer> sort;
 	public static volatile SingularAttribute<PossibleAnswer, Boolean> textanswer;
 	public static volatile SingularAttribute<PossibleAnswer, String> description;
 	public static volatile SingularAttribute<PossibleAnswer, PollQuestion> question;
 	public static volatile ListAttribute<PossibleAnswer, PollAnswer> answers;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/PrintedCard_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/PrintedCard_.java
 package fi.insomnia.bortal.model;
 import java.util.Calendar;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.134+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.300+0300")
 @StaticMetamodel(PrintedCard.class)
 public class PrintedCard_ extends GenericEntity_ {
 	public static volatile SingularAttribute<PrintedCard, LanEvent> event;
 	public static volatile SingularAttribute<PrintedCard, Calendar> printTime;
 	public static volatile SingularAttribute<PrintedCard, String> barcode;
 	public static volatile SingularAttribute<PrintedCard, Boolean> enabled;
 	public static volatile SingularAttribute<PrintedCard, String> rfidUid;
 	public static volatile ListAttribute<PrintedCard, ReaderEvent> readerEvents;
 	public static volatile SingularAttribute<PrintedCard, Integer> printCount;
 	public static volatile SingularAttribute<PrintedCard, Location> currentLocation;
 	public static volatile SingularAttribute<PrintedCard, EventUser> user;
 	public static volatile SingularAttribute<PrintedCard, CardTemplate> template;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/ProductLimitation_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/ProductLimitation_.java
 package fi.insomnia.bortal.model;
 import java.math.BigDecimal;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.148+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.323+0300")
 @StaticMetamodel(ProductLimitation.class)
 public class ProductLimitation_ extends GenericEntity_ {
 	public static volatile SingularAttribute<ProductLimitation, ProductLimitationType> type;
 	public static volatile SingularAttribute<ProductLimitation, Boolean> last;
 	public static volatile SingularAttribute<ProductLimitation, String> name;
 	public static volatile SingularAttribute<ProductLimitation, String> description;
 	public static volatile SingularAttribute<ProductLimitation, Integer> sort;
 	public static volatile ListAttribute<ProductLimitation, Product> products;
 	public static volatile SingularAttribute<ProductLimitation, BigDecimal> upperLimit;
 	public static volatile SingularAttribute<ProductLimitation, BigDecimal> lowerLimit;
 	public static volatile ListAttribute<ProductLimitation, Role> matchingRoles;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Product_.java
 package fi.insomnia.bortal.model;
 import java.math.BigDecimal;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SetAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.141+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.312+0300")
 @StaticMetamodel(Product.class)
 public class Product_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Product, LanEvent> event;
 	public static volatile SingularAttribute<Product, String> color;
 	public static volatile SingularAttribute<Product, String> name;
 	public static volatile SingularAttribute<Product, BigDecimal> price;
 	public static volatile SingularAttribute<Product, Integer> sort;
 	public static volatile SingularAttribute<Product, String> barcode;
 	public static volatile SetAttribute<Product, ProductFlag> productFlags;
 	public static volatile SingularAttribute<Product, Role> provides;
 	public static volatile ListAttribute<Product, Place> places;
 	public static volatile ListAttribute<Product, ProductLimitation> productLimits;
 	public static volatile ListAttribute<Product, AccountEvent> accountEvents;
 	public static volatile ListAttribute<Product, Discount> discounts;
 	public static volatile SingularAttribute<Product, BigDecimal> vat;
 	public static volatile SingularAttribute<Product, String> unitName;
 	public static volatile ListAttribute<Product, FoodWaveTemplate> foodWaveTemplates;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent_.java
 package fi.insomnia.bortal.model;
 import java.util.Calendar;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.162+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.350+0300")
 @StaticMetamodel(ReaderEvent.class)
 public class ReaderEvent_ extends GenericEntity_ {
 	public static volatile SingularAttribute<ReaderEvent, Calendar> time;
 	public static volatile SingularAttribute<ReaderEvent, Calendar> updatetime;
 	public static volatile SingularAttribute<ReaderEvent, String> value;
 	public static volatile SingularAttribute<ReaderEvent, String> notes;
 	public static volatile SingularAttribute<ReaderEvent, Integer> gamePoint;
 	public static volatile SingularAttribute<ReaderEvent, PrintedCard> printedCard;
 	public static volatile SingularAttribute<ReaderEvent, Reader> reader;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader_.java
 package fi.insomnia.bortal.model;
 import fi.insomnia.bortal.model.salespoint.SalesEntity;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.155+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.338+0300")
 @StaticMetamodel(Reader.class)
 public class Reader_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Reader, ReaderType> type;
 	public static volatile SingularAttribute<Reader, LanEvent> event;
 	public static volatile SingularAttribute<Reader, Integer> gamepoints;
 	public static volatile SingularAttribute<Reader, Integer> maxEvents;
 	public static volatile SingularAttribute<Reader, SalesEntity> salesEntity;
 	public static volatile SingularAttribute<Reader, String> identification;
 	public static volatile SingularAttribute<Reader, String> description;
 	public static volatile SingularAttribute<Reader, Location> location;
 	public static volatile SingularAttribute<Reader, EventMap> eventMap;
 	public static volatile SingularAttribute<Reader, Integer> mapX;
 	public static volatile SingularAttribute<Reader, Integer> mapY;
 	public static volatile ListAttribute<Reader, ReaderEvent> events;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Role_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.170+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.359+0300")
 @StaticMetamodel(Role.class)
 public class Role_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Role, String> name;
 	public static volatile ListAttribute<Role, EventUser> users;
 	public static volatile ListAttribute<Role, Role> children;
 	public static volatile ListAttribute<Role, Product> productsProvide;
 	public static volatile ListAttribute<Role, Place> placesProvide;
 	public static volatile ListAttribute<Role, Role> parents;
 	public static volatile ListAttribute<Role, ApplicationPermission> permissions;
 	public static volatile SingularAttribute<Role, CardTemplate> cardTemplate;
 	public static volatile ListAttribute<Role, Discount> discounts;
 	public static volatile ListAttribute<Role, NewsGroup> writeNews;
 	public static volatile ListAttribute<Role, NewsGroup> newsGroups;
 	public static volatile SingularAttribute<Role, LanEvent> event;
 	public static volatile ListAttribute<Role, OrgRole> orgRoles;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/SitePage_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/SitePage_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.192+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.400+0300")
 @StaticMetamodel(SitePage.class)
 public class SitePage_ extends GenericEntity_ {
 	public static volatile SingularAttribute<SitePage, LanEvent> event;
 	public static volatile SingularAttribute<SitePage, String> name;
 	public static volatile SingularAttribute<SitePage, SitePage> parent;
 	public static volatile ListAttribute<SitePage, Role> allowedRoles;
 	public static volatile ListAttribute<SitePage, SitePage> children;
 	public static volatile ListAttribute<SitePage, PageContent> contents;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserImage_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserImage_.java
 package fi.insomnia.bortal.model;
 import java.util.Calendar;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.209+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.422+0300")
 @StaticMetamodel(UserImage.class)
 public class UserImage_ extends GenericEntity_ {
 	public static volatile SingularAttribute<UserImage, Calendar> uploaded;
 	public static volatile SingularAttribute<UserImage, String> name;
 	public static volatile SingularAttribute<UserImage, String> description;
 	public static volatile SingularAttribute<UserImage, String> mimeType;
 	public static volatile SingularAttribute<UserImage, byte[]> imageData;
 	public static volatile SingularAttribute<UserImage, User> user;
 	public static volatile SingularAttribute<UserImage, User> defaultImage;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserNote_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/UserNote_.java
 package fi.insomnia.bortal.model;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.216+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.435+0300")
 @StaticMetamodel(UserNote.class)
 public class UserNote_ extends GenericEntity_ {
 	public static volatile SingularAttribute<UserNote, EventUser> user;
 	public static volatile SingularAttribute<UserNote, String> content;
 	public static volatile SingularAttribute<UserNote, UserNoteType> notetype;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/User_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/User_.java
 package fi.insomnia.bortal.model;
 import fi.insomnia.bortal.enums.Gender;
 import java.util.Calendar;
 import java.util.Date;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.201+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.412+0300")
 @StaticMetamodel(User.class)
 public class User_ extends GenericEntity_ {
 	public static volatile SingularAttribute<User, Calendar> created;
 	public static volatile SingularAttribute<User, String> login;
 	public static volatile SingularAttribute<User, Boolean> active;
 	public static volatile SingularAttribute<User, String> password;
 	public static volatile SingularAttribute<User, String> lastname;
 	public static volatile SingularAttribute<User, String> firstnames;
 	public static volatile SingularAttribute<User, Date> birthday;
 	public static volatile SingularAttribute<User, String> nick;
 	public static volatile SingularAttribute<User, String> email;
 	public static volatile SingularAttribute<User, String> address;
 	public static volatile SingularAttribute<User, String> zip;
 	public static volatile SingularAttribute<User, String> postalTown;
 	public static volatile SingularAttribute<User, String> town;
 	public static volatile SingularAttribute<User, String> phone;
 	public static volatile SingularAttribute<User, UserImage> currentImage;
 	public static volatile SingularAttribute<User, Gender> gender;
 	public static volatile SingularAttribute<User, String> confirmHash;
 	public static volatile SingularAttribute<User, Calendar> confirmTime;
 	public static volatile SingularAttribute<User, Boolean> superadmin;
 	public static volatile ListAttribute<User, UserImage> userImageList;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Vote_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/Vote_.java
 package fi.insomnia.bortal.model;
 import java.util.Calendar;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.223+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.446+0300")
 @StaticMetamodel(Vote.class)
 public class Vote_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Vote, Integer> score;
 	public static volatile SingularAttribute<Vote, String> message;
 	public static volatile SingularAttribute<Vote, Calendar> time;
 	public static volatile SingularAttribute<Vote, CompoEntry> compoEntry;
 	public static volatile SingularAttribute<Vote, EventUser> voter;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/SalesEntity_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/SalesEntity_.java
 package fi.insomnia.bortal.model.salespoint;
 import fi.insomnia.bortal.model.GenericEntity_;
 import fi.insomnia.bortal.model.Reader;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.176+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.370+0300")
 @StaticMetamodel(SalesEntity.class)
 public class SalesEntity_ extends GenericEntity_ {
 	public static volatile SingularAttribute<SalesEntity, String> certificate;
 	public static volatile SingularAttribute<SalesEntity, String> name;
 	public static volatile SingularAttribute<SalesEntity, String> secret;
 	public static volatile SingularAttribute<SalesEntity, SalesEntityType> type;
 	public static volatile SingularAttribute<SalesEntity, Reader> reader;
 	public static volatile SingularAttribute<SalesEntity, Salespoint> point;
 }
--- a/code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/Salespoint_.java
+++ b/code/LanBortalDatabase/src/fi/insomnia/bortal/model/salespoint/Salespoint_.java
 package fi.insomnia.bortal.model.salespoint;
 import fi.insomnia.bortal.model.GenericEntity_;
 import fi.insomnia.bortal.model.LanEvent;
 import javax.annotation.Generated;
 import javax.persistence.metamodel.ListAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.StaticMetamodel;
-@Generated(value="Dali", date="2012-10-06T13:36:55.186+0300")
+@Generated(value="Dali", date="2012-10-06T14:32:35.384+0300")
 @StaticMetamodel(Salespoint.class)
 public class Salespoint_ extends GenericEntity_ {
 	public static volatile SingularAttribute<Salespoint, LanEvent> event;
 	public static volatile SingularAttribute<Salespoint, String> name;
 	public static volatile SingularAttribute<Salespoint, String> description;
 	public static volatile ListAttribute<Salespoint, SalesEntity> entities;
 }
--- a/code/LanBortalWeb/WebContent/layout/template1/template.xhtml
+++ b/code/LanBortalWeb/WebContent/layout/template1/template.xhtml
@@ -22,9 +22,7 @@
 	<h:body>
 		<div id="page-container">
+		<div id="logo">
-		<div id="page-header">
-			<div id="logo">
 				<h:link outcome="/index">
 					<c:choose>
 						<c:when test="#{sessionHandler.isInDevelopmentMode()}">
@@ -37,14 +35,14 @@
 									<h:outputText value="#{layoutView.headertext}" />
 								</h1>
 							</ui:fragment>
-							<!--		 <img src="#{request.contextPath}/resources/style/insomnia2/img/logo.png" />
-						<h1>STREAM INTRA</h1> -->
 						</c:otherwise>
 					</c:choose>
 				</h:link>
 			</div>
+		<div id="page-header">
 			<div id="login">
 				<h:outputText rendered="#{sessionHandler.loggedIn}" value="#{i18n['template.loggedInAs']} #{sessionHandler.currentUser.nick}" />

--- a/code/LanBortalWeb/WebContent/map/create.xhtml
+++ b/code/LanBortalWeb/WebContent/map/create.xhtml
@@ -15,6 +15,7 @@
 					<h:outputText value="#{i18n['map.name']}" />
 					<h:inputText value="#{mapManageView.mapname}" />
 					<h:commandButton id="createrole" value="#{i18n['map.create']}" action="#{mapManageView.createMap}" />
+					<h:commandButton id="createTileMap" value="#{i18n['map.createTileMap']}" action="#{mapManageView.createTileMap}" />
 				</h:panelGrid>
 			</h:form>

--- a/code/LanBortalWeb/WebContent/resources/cditools/user/edit.xhtml
+++ b/code/LanBortalWeb/WebContent/resources/cditools/user/edit.xhtml
--- a/code/LanBortalWeb/WebContent/resources/cditools/user/list.xhtml
+++ b/code/LanBortalWeb/WebContent/resources/cditools/user/list.xhtml
@@ -40,7 +40,6 @@
 				<h:link value="#{i18n['user.firstNames']}" includeViewParams="true">
 					<f:param name="sort" value="firstnames" />
 					<f:param name="page" value="0" />
 				</h:link>
 			</f:facet>
 			<h:outputText value="#{user.firstnames}" />

--- a/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-bg_flat_75_ffffff_40x100.png
--- a/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-bg_glass_65_ffffff_1x400.png
--- a/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-bg_glass_75_dadada_1x400.png
+++ b/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-bg_glass_75_dadada_1x400.png
--- a/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ b/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-bg_glass_75_e6e6e6_1x400.png
--- a/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-bg_glass_95_fef1ec_1x400.png
--- a/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+++ b/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-bg_highlight-soft_75_cccccc_1x100.png
--- a/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-icons_222222_256x240.png
+++ b/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-icons_222222_256x240.png
--- a/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-icons_454545_256x240.png
+++ b/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-icons_454545_256x240.png
--- a/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-icons_888888_256x240.png
+++ b/code/LanBortalWeb/WebContent/resources/primefaces-bortal/images/ui-icons_888888_256x240.png
--- a/code/LanBortalWeb/WebContent/resources/style/insomnia2/css/general.css
+++ b/code/LanBortalWeb/WebContent/resources/style/insomnia2/css/general.css
@@ -15,4 +15,5 @@ display: none;
 /*  general class for hoverable usage  */
 .hoverable {
 }
\ No newline at end of file
--- a/code/LanBortalWeb/WebContent/resources/style/template1/css/general.css
+++ b/code/LanBortalWeb/WebContent/resources/style/template1/css/general.css
@@ -16,4 +16,37 @@ height: 150px;
 /*  general class for hoverable usage  */
 .hoverable {
 }
\ No newline at end of file
+.hidden {
+	display: none;
+}
+#webcamcontainer {
+}
+#shopItems {}
+.shopItem {
+	position: relative;
+	float:left;
+	width: 64px;
+	height: 64px;
+	background: gold;
+	border: 1px solid black;
+	margin: 2px;
+}
+.shopItem:hover {
+	background: goldenrod;
+}
+.shopItem a {
+	display: block;
+	width: 100%;
+	height: 100%;
+	color: black;
+	text-decoration: none;
+}
--- a/code/LanBortalWeb/WebContent/resources/style/template1/css/jquery-ui-1.8.24.custom.css
+++ b/code/LanBortalWeb/WebContent/resources/style/template1/css/jquery-ui-1.8.24.custom.css
--- a/code/LanBortalWeb/WebContent/resources/style/template1/css/style.css
+++ b/code/LanBortalWeb/WebContent/resources/style/template1/css/style.css
@@ -133,13 +133,14 @@ table tbody td {
 border: none;
 padding: 5px;
 padding-left: 1em;
+vertical-align: top;
 }
 label {
 	}
-input {
+/* input {
 border: 1px solid #ccc;
 padding: 3px 6px;
 border-radius: 6px;
@@ -165,3 +166,5 @@ border-radius: 8px;
 border: 1px solid black;
 background: lightblue;
 }
+*/
--- a/code/LanBortalWeb/WebContent/shop/shopToUser.xhtml
+++ b/code/LanBortalWeb/WebContent/shop/shopToUser.xhtml
 <!DOCTYPE html 
     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:products="http://java.sun.com/jsf/composite/cditools/products" xmlns:p="http://primefaces.org/ui" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:products="http://java.sun.com/jsf/composite/cditools/products"
-	xmlns:p="http://primefaces.org/ui"
-	xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition
+	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />
-			<f:event type="preRenderView"
+			<f:event type="preRenderView" listener="#{productShopView.initShopView}" />
-				listener="#{productShopView.initShopView}" />
 		</f:metadata>
 		<ui:define name="title">
@@ -27,7 +20,31 @@
 			<h:form id="shoppingcartform">
 				<h:panelGrid columns="2">
-					<h:panelGrid columns="2">
+					<h:panelGroup>
+						<div id="shopItems">
+							<ui:repeat value="#{productShopView.shoppingcart}" var="cart">
+								<div class="shopItem">
+									<h:commandLink action="#{productShopView.addOne}" value="#{cart.product.name}">
+										<f:ajax render="@form" />
+									</h:commandLink>
+								</div>
+							</ui:repeat>
+						</div>
+					</h:panelGroup>
+					<h:panelGroup>
+					<h:dataGrid >
+					</h:dataGrid>
+						<h:outputLabel value="#{i18n['shop.readBarcode']}" />
+						<h:inputText id="barcode" value="#{productShopView.barcode}" />
+						<h:commandButton action="#{productShopView.readBarcode}" onclick="blip(); return true;" value="#{i18n['productShopView.readBarcode']}">
+							<f:ajax render="@form" onevent="barcodeReadEvent" execute="@form" />
+						</h:commandButton>
 						<h:outputLabel value="#{i18n['shop.accountBalance']}" />
 						<h:outputText value="#{productShopView.accountBalance}">
@@ -44,29 +61,36 @@
 							<f:ajax render="@form" event="valueChange" />
 							<f:convertNumber />
 						</h:inputText>
-					</h:panelGrid>
-					<h:panelGroup>
-						<h:outputLabel value="#{i18n['shop.readBarcode']}" />
-						<h:inputText id="barcode" value="#{productShopView.barcode}" />
-						<h:commandButton action="#{productShopView.readBarcode}"
-							onclick="blip(); return true;"
-							value="#{i18n['productShopView.readBarcode']}">
-							<f:ajax render="@form" onevent="barcodeReadEvent" execute="@form" />
-						</h:commandButton>
 					</h:panelGroup>
 				</h:panelGrid>
 				<h:outputText value="#{i18n['product.shopInstant']}" />
 				<h:selectBooleanCheckbox value="#{productShopView.payInstant}">
 					<f:ajax render="@form" execute="@form" />
 				</h:selectBooleanCheckbox>
-				<products:shop
+				<h:outputScript library="primefaces" name="jquery/jquery.js" />
-					commitaction="#{productShopView.commitShoppingCart()}"
+				<div style="margin-top: 5px;">
-					items="#{productShopView.shoppingcart}"
+					<h:commandButton action="#{cc.attrs.commitaction}" id="commitbutton-top" value="#{cc.attrs.commitValue}" />
-					commitValue="#{i18n['productshop.commit']}" />
+				</div>
+				<div>
+					<h:outputText value="#{i18n['productshop.total']} " />
+					<h:outputText value="#{productShopView.totalPrice}">
+						<f:convertNumber maxFractionDigits="2" minFractionDigits="2" />
+					</h:outputText>
+				</div>
+				<h:commandButton action="#{cc.attrs.commitaction}" id="commitbutton-botton" value="#{cc.attrs.commitValue}" />
 			</h:form>
 			<script>
 				var blipSnd = new Audio(
@@ -74,7 +98,8 @@
 				$(function() {
 					$("#shoppingcartform\\:barcode").focus();
-				})
+				});
 				function blip() {
 					blipSnd.play();

--- a/code/LanBortalWeb/WebContent/useradmin/edit.xhtml
+++ b/code/LanBortalWeb/WebContent/useradmin/edit.xhtml
@@ -22,7 +22,7 @@
 			</p>
 			<users:edit commitaction="#{userView.saveUser()}" commitvalue="#{i18n['user.save']}" />
-			<h:form id="roleform" rendered="#{roleView.canReadRoles()}">
+			<h:form id="roleform" rendered="#{roleView.canReadRoles}">
 				<h2>
 					<h:outputText value="#{i18n['user.roles']}:" />
@@ -31,7 +31,7 @@
 					<f:selectItems var="roleitem" itemLabel="#{roleitem.name}" value="#{roleDataView.roles}" />
 				</h:selectManyCheckbox>
 				<div>
-					<h:message rendered="#{roleView.canReadRoles()}" for="roles" />
+					<h:message rendered="#{roleView.canReadRoles}" for="roles" />
 				</div>
 				<h:commandButton action="#{userView.saveRoles}" value="#{i18n['user.saveRoles']}" />