refactored files

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-27T16:07:46.034+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, BigDecimal> deliveredCount;
+	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;
+}

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-24T19:52:46.826+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;
+}

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-24T19:52:46.819+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;
+}

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-24T19:52:46.830+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;
+}

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-26T02:39:28.679+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;
+	public static volatile SingularAttribute<BillLine, FoodWave> foodwave;
+}

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-24T19:52:46.834+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;
+}

code/LanBortalDatabase/src/fi/insomnia/bortal/model/CardBarcode_.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-11-18T00:45:55.945+0200")
+@StaticMetamodel(CardBarcode.class)
+public class CardBarcode_ extends GenericEntity_ {
+	public static volatile SingularAttribute<CardBarcode, PrintedCard> printedCard;
+}

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-24T19:52:46.843+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;
+}

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-24T19:52:46.856+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;
+}

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-24T19:52:46.860+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;
+}

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-24T19:52:46.852+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;
+}

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-24T19:52:46.847+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;
+}

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-24T19:52:46.868+0300")
+@StaticMetamodel(DiscountInstance.class)
+public class DiscountInstance_ extends GenericEntity_ {
+	public static volatile SingularAttribute<DiscountInstance, AccountEvent> accountEvent;
+	public static volatile SingularAttribute<DiscountInstance, Discount> discount;
+}

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-24T19:52:46.864+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;
+}

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-24T19:52:46.872+0300")
+@StaticMetamodel(EntityEquals.class)
+public class EntityEquals_ {
+}

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-24T19:52:46.875+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;
+}

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-24T19:52:46.880+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;
+}

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-24T19:52:46.885+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;
+}

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Feedback_.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-11-01T13:46:40.118+0200")
+@StaticMetamodel(Feedback.class)
+public class Feedback_ extends GenericEntity_ {
+	public static volatile SingularAttribute<Feedback, EventUser> sender;
+	public static volatile SingularAttribute<Feedback, LanEvent> event;
+	public static volatile SingularAttribute<Feedback, Calendar> timestamp;
+	public static volatile SingularAttribute<Feedback, String> message;
+}

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-11-01T13:46:29.082+0200")
+@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;
+	public static volatile SingularAttribute<FoodWaveTemplate, Integer> maximumFoods;
+}

code/LanBortalDatabase/src/fi/insomnia/bortal/model/FoodWave_.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-11-18T00:45:52.230+0200")
+@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, Date> time;
+	public static volatile SingularAttribute<FoodWave, Integer> maximumFoods;
+	public static volatile SingularAttribute<FoodWave, Boolean> closed;
+	public static volatile ListAttribute<FoodWave, AccountEvent> accountEvents;
+	public static volatile ListAttribute<FoodWave, BillLine> billLines;
+	public static volatile SingularAttribute<FoodWave, FoodWaveTemplate> template;
+}

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-24T19:52:46.897+0300")
+@StaticMetamodel(GenericEntity.class)
+public class GenericEntity_ extends EntityEquals_ {
+	public static volatile SingularAttribute<GenericEntity, Integer> id;
+}

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-24T19:52:46.901+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;
+}

code/LanBortalDatabase/src/fi/insomnia/bortal/model/InventoryEvent_.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-11-18T00:45:52.284+0200")
+@StaticMetamodel(InventoryEvent.class)
+public class InventoryEvent_ extends GenericEntity_ {
+	public static volatile SingularAttribute<InventoryEvent, Date> created;
+	public static volatile SingularAttribute<InventoryEvent, User> user;
+	public static volatile SingularAttribute<InventoryEvent, Product> product;
+	public static volatile SingularAttribute<InventoryEvent, String> info;
+	public static volatile SingularAttribute<InventoryEvent, BigDecimal> quantity;
+}

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-24T19:52:46.910+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;
+}

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-24T19:52:46.914+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;
+}

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-24T19:52:46.918+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;
+}

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-24T19:52:46.905+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;
+}

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-24T19:52:46.923+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;
+}

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-24T19:52:46.930+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;
+}

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-24T19:52:46.927+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;
+}

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-25T01:54:09.095+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;
+}

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-24T19:52:46.934+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;
+}

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-24T19:52:46.947+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;
+}

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-24T19:52:46.943+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;
+}

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-24T19:52:46.952+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;
+}

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-24T19:52:46.956+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;
+}

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-24T19:52:46.964+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;
+}

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-24T19:52:46.960+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;
+}

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-24T19:52:46.973+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;
+}

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-24T19:52:46.976+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;
+}

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-24T19:52:46.968+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;
+}

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-24T19:52:46.980+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;
+}

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-24T19:52:46.985+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;
+}

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-24T19:52:46.995+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;
+}

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-11-18T00:45:52.346+0200")
+@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, String> description;
+	public static volatile SingularAttribute<Product, BigDecimal> price;
+	public static volatile SingularAttribute<Product, BigDecimal> buyInPrice;
+	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, InventoryEvent> inventoryEvents;
+	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;
+}

code/LanBortalDatabase/src/fi/insomnia/bortal/model/ReaderEvent_.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-11-01T13:46:40.201+0200")
+@StaticMetamodel(ReaderEvent.class)
+public class ReaderEvent_ extends GenericEntity_ {
+	public static volatile SingularAttribute<ReaderEvent, Date> time;
+	public static volatile SingularAttribute<ReaderEvent, Date> 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;
+}

code/LanBortalDatabase/src/fi/insomnia/bortal/model/Reader_.java

+package fi.insomnia.bortal.model;
+
+import fi.insomnia.bortal.model.salespoint.SalesEntity;
+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-24T19:52:46.999+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, Product> automaticProduct;
+	public static volatile SingularAttribute<Reader, BigDecimal> automaticProductCount;
+	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;
+}

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-24T19:52:47.008+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;
+}

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-24T19:52:47.021+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;
+}

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-24T19:52:47.031+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;
+}

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-24T19:52:47.035+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;
+}

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-24T19:52:47.025+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;
+}

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-24T19:52:47.039+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;
+}

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-24T19:52:47.012+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;
+}

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-24T19:52:47.017+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;
+}

code/LanBortalWeb/WebContent/useradmin/export.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" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:p="http://primefaces.org/ui" xmlns:f="http://java.sun.com/jsf/core">
+<h:body>
+		<f:metadata>
+			<f:event type="preRenderView" listener="#{placeGroupView.}" />
+		</f:metadata>
+Etunimi;Sukunimi;Nick;Osoite;Kaupunki;Email;Puhelin;Konepaikat<br/>
+	<ui:repeat var="usr" value="#{userSearchView.eventUserResults}">#{usr.firstnames};#{usr.lastname};#{usr.nick};#{usr.address};#{usr.postalTown};#{usr.email};#{usr.phone};<ui:repeat var="places" value="#{usr.currentPlaces}">#{#places.name},</ui:repeat><br/></ui:repeat>
+	</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs

+XDOCLETBUILDERACTIVE=true
+XDOCLETHOME=
+XDOCLETUSEGLOBAL=true
+XDOCLETVERSION=1.2.1
+eclipse.preferences.version=1

code/MoyaWeb/WebContent/actionlog/messagelist.xhtml

@@ -5,7 +5,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<!-- f:event type="preRenderView" listener="#{newsListView.initView}" /-->
 		</f:metadata>

code/MoyaWeb/WebContent/actionlog/taskview.xhtml

@@ -5,7 +5,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="id" value="#{taskModificationView.id}"></f:viewParam>
 			<f:event type="preRenderView" listener="#{taskModificationView.initView}" />

code/MoyaWeb/WebContent/admin/port/index.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"
+	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:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:p="http://primefaces.org/ui"
+	xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop"
+	xmlns:tools="http://java.sun.com/jsf/composite/cditools">
+<h:body>
+	<ui:composition
+		template="/layout/#{sessionHandler.fullscreen}/template.xhtml">
+
+		<f:metadata>
+			<f:event type="preRenderView" listener="#{barcodeView.initView}" />
+		</f:metadata>
+		<f:metadata>
+			<f:event type="preRenderView" listener="#{readerListDataView.initView}" />
+		<f:event type="preRenderView" listener="#{readerList.initReaderList}" />
+		
+		</f:metadata>
+		<ui:define name="content">
+		<h:form>
+				<h:inputText name="barcode" value="#{barcodeView.barcode}" />
+				<h:commandButton action="#{barcodeView.readPortBarcode}" value="#{i18n['barcodeReader.readBarcode']}"/>
+		</h:form>
+		</ui:define>
+
+		<ui:define name="sidebar">
+		
+			
+		</ui:define>
+		
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/auth/login.xhtml

@@ -9,7 +9,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{authView.executeLogin}" />
 		</f:metadata>

code/MoyaWeb/WebContent/auth/loginError.xhtml

@@ -8,7 +8,7 @@ xmlns:f="http://java.sun.com/jsf/core"
 xmlns:login="http://java.sun.com/jsf/composite/cditools/login" 
 xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 			<h1>#{i18n['loginerror.header']}</h1>
 

code/MoyaWeb/WebContent/auth/loginSuccessRedirect.xhtml

@@ -9,7 +9,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{authView.executeLogin}" />
 		</f:metadata>

code/MoyaWeb/WebContent/auth/logout.xhtml

@@ -6,7 +6,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{authView.executeLogout}" />
 		</f:metadata>

code/MoyaWeb/WebContent/auth/logoutResponse.xhtml

@@ -6,7 +6,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 
 		<ui:define name="content">
 			<h:outputText value="#{i18n['login.logoutmessage']}" />

code/MoyaWeb/WebContent/auth/passwordChanged.xhtml

@@ -8,7 +8,7 @@ xmlns:f="http://java.sun.com/jsf/core"
 xmlns:login="http://java.sun.com/jsf/composite/tools/login" 
 xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 			<h1>#{i18n['passwordChanged.header']}</h1>
 

code/MoyaWeb/WebContent/auth/resetmailSent.xhtml

@@ -8,7 +8,7 @@ xmlns:f="http://java.sun.com/jsf/core"
 xmlns:login="http://java.sun.com/jsf/composite/tools/login" 
 xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 			<h1>#{i18n['resetmailSent.header']}</h1>
 

code/MoyaWeb/WebContent/auth/userSessionList.xhtml

@@ -6,7 +6,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{userSessionView.initView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/bill/billSummary.xhtml

@@ -4,7 +4,7 @@
 <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:bills="http://java.sun.com/jsf/composite/tools/bills"
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{billListView.initSummaryView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/bill/edit.xhtml

@@ -3,7 +3,7 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:p="http://primefaces.org/ui"  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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="billid" value="#{billEditView.billid}" />
 			<f:event type="preRenderView" listener="#{billEditView.initView}" />

code/MoyaWeb/WebContent/bill/list.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{billListView.initUsersBills}" />

code/MoyaWeb/WebContent/bill/listAll.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{billListView.initAllBills}" />
 		</f:metadata>

code/MoyaWeb/WebContent/bill/showBill.xhtml

@@ -6,7 +6,7 @@
 
 <h:body>
 
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="billid" value="#{billEditView.billid}" />
 			<f:event type="preRenderView" listener="#{billEditView.initView}" />

code/MoyaWeb/WebContent/card/massprint.xhtml

@@ -5,7 +5,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core"
 	xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{cardMassPrintView.initView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/checkout/cancel.xhtml

@@ -5,7 +5,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="VERSION" value="#{checkoutView.version}" />
 			<f:viewParam name="STAMP" value="#{checkoutView.stamp}" />

code/MoyaWeb/WebContent/checkout/delayed.xhtml

@@ -5,7 +5,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="VERSION" value="#{checkoutView.version}" />
 			<f:viewParam name="STAMP" value="#{checkoutView.stamp}" />

code/MoyaWeb/WebContent/checkout/reject.xhtml

@@ -5,7 +5,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="VERSION" value="#{checkoutView.version}" />
 			<f:viewParam name="STAMP" value="#{checkoutView.stamp}" />

code/MoyaWeb/WebContent/checkout/return.xhtml

@@ -5,7 +5,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="VERSION" value="#{checkoutView.version}" />
 			<f:viewParam name="STAMP" value="#{checkoutView.stamp}" />

code/MoyaWeb/WebContent/eventorg/create.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.eventorg.create" />
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{eventorgView.initCreate}" />

code/MoyaWeb/WebContent/eventorg/edit.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.eventorg.edit" />
 		<f:metadata>
 			<f:viewParam name="id" value="#{eventorgView.orgId}" />

code/MoyaWeb/WebContent/eventorg/editEvent.xhtml

@@ -4,7 +4,7 @@
 <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:p="http://primefaces.org/ui"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="eventid" value="#{eventorgView.eventid}" />
 			<f:event type="preRenderView" listener="#{eventorgView.initEditEvent}" />

code/MoyaWeb/WebContent/eventorg/list.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{eventorgView.initListView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/feedback/index.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:p="http://primefaces.org/ui" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.eventorg.create" />
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{feedbackView.initFeedback}" />

code/MoyaWeb/WebContent/food/foodShop.xhtml

@@ -4,7 +4,7 @@
 <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:products="http://java.sun.com/jsf/composite/cditools/products" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/food/shop.xhtml

@@ -4,7 +4,7 @@
 <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:products="http://java.sun.com/jsf/composite/cditools/food" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
  			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/foodadmin/createTemplate.xhtml

@@ -11,7 +11,7 @@
 	xmlns:p="http://primefaces.org/ui">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView"
 				listener="#{foodWaveView.initCreateTemplate()}" />

code/MoyaWeb/WebContent/foodadmin/editTemplate.xhtml

@@ -11,7 +11,7 @@
 	xmlns:p="http://primefaces.org/ui">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="id" value="#{foodWaveView.templateId}" />
 			<f:event type="preRenderView"

code/MoyaWeb/WebContent/foodadmin/listTemplates.xhtml

@@ -10,7 +10,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="id" value="#{foodWaveView.templateId}" />
 			<f:event type="preRenderView"

code/MoyaWeb/WebContent/foodmanager/listFoodwaves.xhtml

@@ -3,7 +3,7 @@
     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <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:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{foodWaveView.initFoodwaveManagerList}" />
 		</f:metadata>

code/MoyaWeb/WebContent/foodmanager/listOrders.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" 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:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="foodwaveid" value="#{foodWaveView.foodWaveId}" />
 			<f:event type="preRenderView" listener="#{foodWaveView.initFoodWaveOrderList}" />

code/MoyaWeb/WebContent/foodwave/ThanksForOrderingFromCounter.xhtml

@@ -10,7 +10,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView"

code/MoyaWeb/WebContent/foodwave/create.xhtml

@@ -6,7 +6,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:products="http://java.sun.com/jsf/composite/tools/products"
 	xmlns:foodwave="http://java.sun.com/jsf/composite/tools">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.product.create" />
 		<ui:define name="content">
 			<foodwave:modify />

code/MoyaWeb/WebContent/foodwave/list.xhtml

@@ -11,7 +11,7 @@
 	xmlns:p="http://primefaces.org/ui">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:viewParam name="templateid" value="#{foodWaveView.templateId}" />

code/MoyaWeb/WebContent/foodwave/listProducts.xhtml

@@ -11,7 +11,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="foodwaveid" value="#{foodWaveFoodView.foodwaveid}" />
 			<f:event type="preRenderView" listener="#{foodWaveFoodView.initFoodWaveFoods}" />

code/MoyaWeb/WebContent/foodwave/listTemplates.xhtml

@@ -4,7 +4,7 @@
 <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:foodwave="http://java.sun.com/jsf/composite/cditools/foodwave" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
  			<f:viewParam name="userid" value="#{userView.userid}" />
  			<f:event type="preRenderView" listener="#{foodWaveView.initTemplateList}" />

code/MoyaWeb/WebContent/game/index.xhtml

@@ -6,7 +6,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.game.list" />
 		<ui:define name="content">
 

code/MoyaWeb/WebContent/game/list.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:products="http://java.sun.com/jsf/composite/tools/products"
 	xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.game.list" />
 		<ui:define name="content">
 		

code/MoyaWeb/WebContent/game/start.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:products="http://java.sun.com/jsf/composite/tools/products"
 	xmlns:tools="http://java.sun.com/jsf/composite/tools" xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.game.start" />
 		<ui:define name="content">
 			<h1>Insomnia Game</h1>

code/MoyaWeb/WebContent/index.insomnia.xhtml

@@ -6,7 +6,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 
 		<ui:define name="content">
 		

code/MoyaWeb/WebContent/index.xhtml

@@ -4,7 +4,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{pageOutputView.initIndexView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/map/create.xhtml

@@ -4,7 +4,7 @@
 <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:map="http://java.sun.com/jsf/composite/cditools/map" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{mapManageView.initCreate}" />
 		</f:metadata>

code/MoyaWeb/WebContent/map/edit.xhtml

@@ -4,7 +4,7 @@
 <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:map="http://java.sun.com/jsf/composite/cditools/map" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="mapid" value="#{mapManageView.mapId}" />
 			<f:event type="preRenderView" listener="#{mapManageView.initView}" />

code/MoyaWeb/WebContent/map/list.xhtml

@@ -7,7 +7,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.role.list" />
 		<ui:define name="content">
 			<map:list />

code/MoyaWeb/WebContent/menu/list.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{menuListView.initList}" />
 		</f:metadata>

code/MoyaWeb/WebContent/menu/menulist.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{menuListView.initList}" />
 		</f:metadata>

code/MoyaWeb/WebContent/news/create.xhtml

@@ -6,7 +6,7 @@
 	xmlns:news="http://java.sun.com/jsf/composite/cditools/news" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{newsgroupView.initCreate}" />
 		</f:metadata>

code/MoyaWeb/WebContent/news/edit.xhtml

@@ -6,7 +6,7 @@
 	xmlns:news="http://java.sun.com/jsf/composite/cditools/news" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="newsgroupid" value="#{newsgroupView.newsgroupid}" />
 			<f:event type="preRenderView" listener="#{newsgroupView.initView}" />

code/MoyaWeb/WebContent/news/editNews.xhtml

@@ -7,7 +7,7 @@
 	xmlns:p="http://primefaces.org/ui"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="newsid" value="#{newsgroupView.newsid}" />
 			<f:viewParam name="newsgroupid" value="#{newsgroupView.newsgroupid}" />

code/MoyaWeb/WebContent/news/listAll.xhtml

@@ -6,7 +6,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{newsListView.initView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/orgrole/create.xhtml

@@ -9,7 +9,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 
 <ui:composition
-	template="/layout/#{sessionHandler.layout}/template.xhtml">
+	template="#{sessionHandler.template}">
 
 	<ui:param name="thispage" value="page.orgRole.create" />
 

code/MoyaWeb/WebContent/orgrole/list.xhtml

@@ -10,7 +10,7 @@
 	>
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.orgrole.list" />
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{orgRoleView.permissionList()}" />

code/MoyaWeb/WebContent/pages/create.xhtml

@@ -6,7 +6,7 @@
 	xmlns:pages="http://java.sun.com/jsf/composite/cditools/pages" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{sitePageView.initCreate}" />
 		</f:metadata>

code/MoyaWeb/WebContent/pages/edit.xhtml

@@ -6,7 +6,7 @@
 	xmlns:pages="http://java.sun.com/jsf/composite/cditools/pages" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="id" value="#{sitePageView.id}" />
 			<f:event type="preRenderView" listener="#{sitePageView.initEdit}" />

code/MoyaWeb/WebContent/pages/index.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="id" value="#{pageOutputView.id}" />
 			<f:event type="preRenderView" listener="#{pageOutputView.initView}" />

code/MoyaWeb/WebContent/pages/list.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{sitePageView.initListView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/pages/manage.xhtml

@@ -6,7 +6,7 @@
 	xmlns:pages="http://java.sun.com/jsf/composite/cditools/pages" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="pagename" value="#{sitePageView.managedPage}" />
 			<f:event type="preRenderView" listener="#{sitePageView.initManage}" />

code/MoyaWeb/WebContent/permissionDenied.xhtml

@@ -7,7 +7,7 @@
       xmlns:p="http://primefaces.org/ui" >
    
  <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 			<h1>#{i18n['permissiondenied.header']}</h1>
 			<p>

code/MoyaWeb/WebContent/pic.xhtml

@@ -5,7 +5,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.viewexpired" />
 		<ui:define name="content">
 			<param name="foo" width="640" height="480"

code/MoyaWeb/WebContent/place/adminGroups.xhtml

@@ -6,7 +6,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.place.mygroups" />
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />

code/MoyaWeb/WebContent/place/edit.xhtml

@@ -7,7 +7,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="placeid" value="#{placeView.placeId}" />
 			<f:event type="preRenderView" listener="#{placeView.initView}" />

code/MoyaWeb/WebContent/place/editGroup.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jsp/jstl/core"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.place.edit" />
 		<ui:define name="content">
 			<h1>#{i18n['editplacegroup.header']}</h1>

code/MoyaWeb/WebContent/place/myGroups.xhtml

@@ -4,7 +4,7 @@
 <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:c="http://java.sun.com/jsp/jstl/core"
 	xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.place.mygroups" />
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />

code/MoyaWeb/WebContent/place/placeManagement.xhtml

@@ -7,7 +7,7 @@
 
 <h:body>
 
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.place.placemap" />
 		<ui:define name="content">
 

code/MoyaWeb/WebContent/place/placemap.xhtml

@@ -8,7 +8,7 @@
 
 <h:body>
 
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{mapView.initViewMap()}" />
 			<f:viewParam name="userid" value="#{userView.userid}" />

code/MoyaWeb/WebContent/poll/answerToPoll.xhtml

@@ -6,7 +6,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="pollid" value="#{pollView.pollId}" />
 			<f:event type="preRenderView" listener="#{pollView.initPoll}" />

code/MoyaWeb/WebContent/poll/create.xhtml

@@ -7,7 +7,7 @@
 	xmlns:p="http://primefaces.org/ui"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{pollView.initCreate}" />
 		</f:metadata>

code/MoyaWeb/WebContent/poll/edit.xhtml

@@ -4,7 +4,7 @@
 <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:poll="http://java.sun.com/jsf/composite/cditools/poll" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="pollid" value="#{pollView.pollId}" />
 			<f:event type="preRenderView" listener="#{pollView.initPoll}" />

code/MoyaWeb/WebContent/poll/index.xhtml

@@ -6,7 +6,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{pollView.initPollList()}" />

code/MoyaWeb/WebContent/poll/show.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="pollid" value="#{pollView.pollId}" />
 			<f:event type="preRenderView" listener="#{pollView.initPoll}" />

code/MoyaWeb/WebContent/poll/thankYou.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.poll.answered" />
 	
 	

code/MoyaWeb/WebContent/product/addInventory.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{addInventoryView.initCreateInventory}" />
 		</f:metadata>

code/MoyaWeb/WebContent/product/create.xhtml

@@ -6,7 +6,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:products="http://java.sun.com/jsf/composite/cditools/products"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{productView.initCreateView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/product/createDiscount.xhtml

@@ -9,7 +9,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 
 		<ui:define name="content">
 				

code/MoyaWeb/WebContent/product/edit.xhtml

@@ -10,7 +10,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="productid" value="#{productView.productId}" />
 			<f:event type="preRenderView" listener="#{productView.initEditView}" />

code/MoyaWeb/WebContent/product/editDiscount.xhtml

@@ -8,7 +8,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 
 		<ui:define name="content">
 			<products:manageDiscount commitaction="#{productView.saveProduct()}" commitvalue="#{i18n['discount.save']}" />

code/MoyaWeb/WebContent/product/list.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{productListView.initView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/resources/templates/adduser/template.xhtml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:tools="http://java.sun.com/jsf/composite/cditools"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:p="http://primefaces.org/ui">
+
+<f:view contentType="text/html" locale="#{sessionHandler.locale}">
+
+	<h:head>
+
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+		<title><h:outputText value="#{layoutView.getHeader()}" /></title>
+		<meta name="description" content="Lippukauppa" />
+		<meta name="author" content="CodeCrew ry" />
+		<meta http-equiv="Content-Language" content="fi" />
+
+		<link rel="stylesheet" type="text/css"
+			href="#{request.contextPath}/resources/style/adduser/css/style.css" />
+		<link rel="stylesheet" type="text/css"
+			href="#{request.contextPath}/resources/style/adduser/css/general.css" />
+		<ui:insert name="headerdata" />
+
+	</h:head>
+
+
+	<h:body>
+ <h:outputScript library="primefaces" name="jquery/jquery.js" />
+		<div class="container top">
+			<ui:insert name="topbar" />
+		</div>
+
+		<div class="container clearfix">
+
+			<div id="content" class="boxcenter">
+				<ui:insert name="content" />
+			</div>
+
+		</div>
+
+
+		<script>
+		$(function(){
+			   
+			 $(window).resize(function() {
+				 onResize(); });
+					
+
+			 function onResize() {
+				 $('.boxcenter').css({
+					   position:'absolute',
+					   left: ($(window).width() 
+					     - $('.boxcenter').outerWidth())/2,
+					   top: ($(window).height() 
+					     - $('.boxcenter').outerHeight())/2
+				 });
+				
+				}
+			 
+			 // To initially run the function:
+			 onResize();
+		});
+
+
+		</script>
+		
+	</h:body>
+
+</f:view>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/blipview/template.xhtml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:tools="http://java.sun.com/jsf/composite/cditools"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:p="http://primefaces.org/ui">
+
+<f:view contentType="text/html" locale="#{sessionHandler.locale}">
+
+	<h:head>
+
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+		<title><h:outputText value="#{layoutView.getHeader()}" /></title>
+		<meta name="description" content="Lippukauppa" />
+		<meta name="author" content="CodeCrew ry" />
+		<meta http-equiv="Content-Language" content="fi" />
+
+		<link rel="stylesheet" type="text/css"
+			href="#{request.contextPath}/resources/style/blipview/css/style.css" />
+		<link rel="stylesheet" type="text/css"
+			href="#{request.contextPath}/resources/style/blipview/css/general.css" />
+		<ui:insert name="headerdata" />
+
+	</h:head>
+
+
+	<h:body>
+	
+		<p:menubar model="#{primeMenuView.menuModel}">
+
+
+		</p:menubar>
+
+		<div class="container top">
+			<ui:insert name="topbar" />
+		</div>
+
+		<div class="container clearfix">
+
+			<div id="right">
+				<ui:insert name="sidebar" />
+			</div>
+
+			<div id="left">
+				<ui:insert name="content" />
+			</div>
+
+		</div>
+
+
+		<!-- Piwik -->
+		<script type="text/javascript">
+			var pkBaseURL = (("https:" == document.location.protocol) ? "https://jolez.pingtimeout.net/piwik/"
+					: "http://jolez.pingtimeout.net/piwik/");
+			document.write(unescape("%3Cscript src='" + pkBaseURL
+					+ "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+		</script>
+		<script type="text/javascript">
+			try {
+				var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 5);
+				piwikTracker.trackPageView();
+				piwikTracker.enableLinkTracking();
+			} catch (err) {
+			}
+		</script>
+
+		<noscript>
+			<p>
+				<img src="http://jolez.pingtimeout.net/piwik/piwik.php?idsite=5"
+					style="border: 0" alt="" />
+			</p>
+		</noscript>
+		<!-- End Piwik Tracking Code -->
+	</h:body>
+
+</f:view>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/insomnia1/sidebar-admin.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" 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:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/cditools">
+<h:body>
+	<ui:composition rendered="#{sessionHandler.loggedIn}" template="/layout/insomnia1/sidebartemplate.xhtml">
+		<ui:param name="rendered" value="true" />
+		<ui:define name="sidebarcontent">
+			<ul>
+				<tools:canRead target="ROLE_MANAGEMENT">
+					<li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.roles']}" />
+					<ul>
+						<li><h:link outcome="/role/create" value="#{i18n['sidebar.role.create']}" /></li>
+						<li><h:link outcome="/role/list" value="#{i18n['sidebar.role.list']}" /></li>
+						<li><h:link outcome="/user/createCardTemplate" value="#{i18n['sidebar.cardTemplate.create']}" /></li>
+						<li><h:link outcome="/user/listCardTemplates" value="#{i18n['sidebar.cardTemplate.list']}" /></li>
+
+					</ul>
+					</li>
+				</tools:canRead>
+				<tools:canRead target="BILL">
+					<li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.bills']}" />
+					<ul>
+						<li><h:link outcome="/bill/list" value="#{i18n['sidebar.bill.listAll']}" /></li>
+						<li><h:link outcome="/bill/billSummary" value="#{i18n['sidebar.bill.summary']}" /></li>
+					</ul>
+					</li>
+				</tools:canRead>
+				<tools:canRead target="USER_MANAGEMENT">
+					<li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.users']}" />
+					<ul>
+						<li><h:link outcome="/user/create" value="#{i18n['sidebar.user.create']}" /></li>
+						<li><h:link outcome="/user/list" value="#{i18n['sidebar.user.list']}" /></li>
+					</ul>
+					</li>
+				</tools:canRead>
+				<tools:canRead target="PRODUCT">
+					<li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.products']}" />
+					<ul>
+						<li><h:link outcome="/product/create" value="#{i18n['sidebar.product.create']}" /></li>
+						<li><h:link outcome="/product/list" value="#{i18n['sidebar.product.list']}" /></li>
+					</ul>
+					</li>
+				</tools:canRead>
+
+				<tools:canRead target="MAP">
+					<li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.maps']}" />
+					<ul>
+						<li><h:link outcome="/map/list" value="#{i18n['sidebar.map.list']}" /></li>
+					</ul>
+					</li>
+				</tools:canRead>
+
+
+				<li><h:outputText styleClass="sidebartitle" value="#{i18n['sidebar.other']}" />
+				<ul>
+					<li><h:link outcome="/eventorg/list" value="#{i18n['sidebar.eventorg.list']}" /></li>
+					<li><h:link outcome="/utils/flushCache" value="#{i18n['sidebar.utils.flushCache']}" /></li>
+					<li><h:link outcome="/generateTestData" value="#{i18n['sidebar.utils.testdata']}" /></li>
+
+				</ul>
+				</li>
+			</ul>
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/insomnia1/sidebar-frontpage.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"
+	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:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml">
+		<ui:param name="rendered" value="#{!sessionHandler.loggedIn}" />		
+		<ui:define name="sidebarcontent">
+			<ul>
+				<li><h:link outcome="/user/create.xhtml" value="#{i18n['sidebar.createuser']}"/></li>
+			</ul>
+
+		</ui:define>
+	</ui:composition>
+	</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/insomnia1/sidebar-game.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" 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:tools="http://java.sun.com/jsf/composite/tools" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml">
+		<ui:param name="rendered" value="false" />
+		<ui:define name="sidebarcontent">
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/insomnia1/sidebar-login.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"
+	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:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml">
+		<ui:define name="sidebarcontent">
+			<ul>
+				<li><h:link outcome="/user/create.xhtml" value="#{i18n['sidebar.user.create']}"/></li>
+			</ul>
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/insomnia1/sidebar-placemap.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" 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:tools="http://java.sun.com/jsf/composite/tools" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml">
+		<ui:param name="rendered" value="false" />
+		<ui:define name="sidebarcontent">
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/insomnia1/sidebar-poll.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"
+	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:tools="http://java.sun.com/jsf/composite/tools"
+	xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml">
+		<ui:param name="rendered" value="false" />
+		<ui:define name="sidebarcontent">
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/insomnia1/sidebar-rfidshop.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" 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:tools="http://java.sun.com/jsf/composite/tools" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml">
+		<ui:param name="rendered" value="true" />
+		<ui:define name="sidebarcontent">
+			<ul>
+
+				<li><h:link outcome="/shop/listReaders" value="#{i18n['sidebar.shop.readerlist']}" /></li>
+				<li><h:link outcome="/shop/showReaderEvents" value="#{i18n['sidebar.shop.readerEvents']}" /></li>
+			</ul>
+
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/insomnia1/sidebar-shop.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"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:h="http://java.sun.com/jsf/html"
+    xmlns:tools="http://java.sun.com/jsf/composite/tools"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml">
+				<ui:param name="rendered" value="true" />		
+		
+		<ui:define name="sidebarcontent">
+			<ul>
+				
+				<li><h:link outcome="/bill/list" value="#{i18n['sidebar.bill.list']}"/></li>
+				
+ 			</ul>
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/insomnia1/sidebar-user.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"
+	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:tools="http://java.sun.com/jsf/composite/tools"
+	xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="/layout/insomnia1/sidebartemplate.xhtml">
+		<ui:param name="rendered" value="#{sessionHandler.isLoggedIn()}" />		
+		<ui:define name="sidebarcontent">
+			<ul>	
+				<li><h:link outcome="/user/sendPicture" value="#{i18n['user.sendPicture']}"/></li>
+				<li><h:link outcome="/user/changePassword" value="#{i18n['user.changePassword']}"/></li>
+				<li><h:link outcome="/user/accountEvents" value="#{i18n['user.accountEvents']}"/></li>
+				<li><h:link outcome="/place/myGroups" value="#{i18n['user.myGroups']}"/></li>
+				<li><h:link outcome="/place/insertToken" value="#{i18n['user.insertToken']}"/></li>
+
+			</ul>
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/insomnia1/sidebartemplate.xhtml

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core">
+<h:head>
+	<title></title>
+</h:head>
+<h:body>
+	<ui:component>
+	
+		<c:if test="#{rendered}">
+			<div id="sidebar"><ui:insert name="sidebarcontent" /></div>
+		</c:if>
+	</ui:component>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/insomnia1/template.xhtml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+>
+
+<f:view locale="#{sessionHandler.locale}" >
+
+	<ui:insert name="metadata" />
+	<h:head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+		<title><h:outputText value="#{i18n['global.eventname']}" /> - <h:outputText
+				value="#{i18n[util.concat(thispage,'.header') ] }"
+			/>
+		</title>
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/insomnia1/style.css" />
+		<ui:insert name="headerdata" />
+	</h:head>
+	<h:body >
+
+		<div id="wrapper">
+
+			<div id="navigation">
+
+				<div id="topheadercontainer">
+					<img id="head" src="#{request.contextPath}/resources/style/insomnia1/img/header.gif" alt="headerimage" />
+
+					<div style="float: left">
+						<div id="headerbox">
+							<tools:isLoggedIn>#{sessionHandler.currentUser.nick}</tools:isLoggedIn>
+							<tools:loginLogout />
+						</div>
+
+
+
+					</div>
+				</div>
+				<div id="mainmenu">
+					<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'frontpage'?'a':''}">
+						<h:link outcome="/index" value="#{i18n['topmenu.frontpage']}" />
+					</div>
+					<tools:isLoggedIn>
+						<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'user'?'a':''}">
+							<h:link outcome="/user/edit" value="#{i18n['topmenu.usersPreferences']}" />
+						</div>
+						<!-- 	<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'shop'?'a': ''}"><h:link
+				outcome="/product/createBill" value="#{i18n['topmenu.shoppings']}" /></div>
+ -->
+
+					</tools:isLoggedIn>
+					<tools:canExecute target="POLL">
+						<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'poll'?'a': ''}">
+							<h:link outcome="/poll/start" value="#{i18n['topmenu.poll']}" />
+						</div>
+					</tools:canExecute>
+
+					<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'placemap'?'a':''}">
+						<h:link outcome="/place/placemap" value="#{i18n['topmenu.placemap']}" />
+					</div>
+
+					<tools:canRead target="USER_MANAGEMENT">
+						<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'admin'?'a':''}">
+							<h:link outcome="/product/list" value="#{i18n['topmenu.adminfront']}" />
+						</div>
+						<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'rfidshop'?'a':''}">
+							<h:link outcome="/shop/showReaderEvents" value="#{i18n['topmenu.rfidshop']}" />
+						</div>
+
+					</tools:canRead>
+					<tools:canRead target="GAME">
+						<div class="link#{i18n[util.concat(thispage,'.pagegroup')] == 'game'?'a':''}">
+							<h:link outcome="/game/start" value="#{i18n['topmenu.game']}" />
+						</div>
+					</tools:canRead>
+				</div>
+
+			</div>
+			<div id="content">
+				<div id="cwrap">
+					<ui:include src="/layout/insomnia1/sidebar-#{i18n[util.concat(thispage,'.pagegroup')]}.xhtml" />
+
+					<h:messages globalOnly="true" />
+					<ui:insert name="content" />
+				</div>
+			</div>
+			<div id="footer">#{i18n['global.copyright']}</div>
+		</div>
+	</h:body>
+</f:view>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/insomnia2/template.xhtml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:tools="http://java.sun.com/jsf/composite/cditools"
+	xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
+
+<f:view contentType="text/html" locale="#{sessionHandler.locale}">
+	<h:head>
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+		<title><h:outputText value="#{layoutView.getHeader()}" /></title>
+		<meta name="description" content="Insomnia lippukauppa" />
+		<meta name="author" content="Niko Juusela, csharp" />
+		<meta http-equiv="Content-Language" content="fi" />
+
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/insomnia2/css/tyyli.css" />
+		<!-- general style for nonlayout elements -->
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/insomnia2/css/general.css" />
+		<ui:insert name="headerdata" />
+		<h:outputScript name="prime_calendar.js" library="script" />
+	</h:head>
+	<h:body>
+		<div id="header">
+			<div id="logo">
+				<h:link outcome="/index">
+					<c:choose>
+						<c:when test="#{sessionHandler.isInDevelopmentMode()}">
+							<img src="#{request.contextPath}/resources/style/insomnia2/img/devel_logo.png" />
+						</c:when>
+						<c:otherwise>
+							<p:graphicImage rendered="#{!empty layoutView.headerimage}" value="#{layoutView.headerimage}" />
+							<ui:fragment rendered="#{empty layoutView.headerimage}">
+								<h1>
+									<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="login">
+				<h:outputText rendered="#{sessionHandler.loggedIn}" value="#{i18n['template.loggedInAs']} #{sessionHandler.currentUser.nick}" />
+				<div>
+					<tools:loginLogout />
+					
+				</div>
+			</div>
+			<ui:fragment rendered="#{menuView.getMenu(0).size() > 1}">
+				<ul id="topmenu">
+					<li jsfc="ui:repeat" var="menuitem" value="#{menuView.getMenu(0)}"><h:link outcome="#{menuitem.outcome}" value="#{i18n[menuitem.navigation.key]}"
+							styleClass="#{menuitem.selected?'active':''}" /></li>
+					<ui:fragment rendered="#{feedbackView.canFeedback}" >
+						<li><h:link outcome="/feedback/index" value="#{i18n['feedback.canFeedback']}" /></li>
+					</ui:fragment>
+					<li></li>
+				</ul>
+			</ui:fragment>
+		</div>
+
+		<div id="wrapper">
+			<div id="navigation">
+				<ul class="menu">
+					<li jsfc="ui:repeat" var="menuitem" value="#{menuView.getMenu(1)}"><h:link outcome="#{menuitem.outcome}" value="#{i18n[menuitem.navigation.key]}"
+							styleClass="#{menuitem.selected?'active':''}" /></li>
+				</ul>
+			</div>
+			<h:link  rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editTop']}" outcome="/pages/manage">
+				<f:param name="pagename" value="#{layoutView.pagepath}:top" />
+			</h:link>
+			<div class="container top" />
+			<div class="container clearfix">
+				<ui:fragment rendered="#{menuView.getMenu(2).size() > 1}">
+					<div id="right">
+
+						<ul class="menu">
+							<ui:repeat var="menuitem" value="#{menuView.getMenu(2)}">
+								<h:outputText rendered="#{!empty menuitem.header}" value="&lt;/ul>&lt;h1>#{i18n[menuitem.header]}&lt;/h1>&lt;ul>" escape="false" />
+								<li><h:link outcome="#{menuitem.outcome}" value="#{i18n[menuitem.navigation.key]}" styleClass="#{menuitem.selected?'active':''}" /></li>
+							</ui:repeat>
+						</ul>
+					</div>
+				</ui:fragment>
+				<div id="left">
+					<ui:insert name="title" />
+					<p:messages />
+					<ui:repeat var="cont1" value="#{menuView.getPagecontent('top')}">
+						<h:outputText value="#{cont1.content}" escape="false" />
+					</ui:repeat>
+					<ui:insert name="content" />
+					<ui:repeat var="cont1" value="#{menuView.getPagecontent('bottom')}">
+						<h:outputText value="#{cont1.content}" escape="false" />
+					</ui:repeat>
+				</div>
+
+			</div>
+			<h:link  rendered="#{layoutView.manageContent}" styleClass="editorlink" value="#{i18n['layout.editBottom']}" outcome="/pages/manage">
+				<f:param name="pagename" value="#{layoutView.pagepath}:bottom" />
+			</h:link>
+			<div class="container bottom">
+	
+			</div>
+		</div>
+
+
+
+
+	</h:body>
+</f:view>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/originalToneTemplate.xhtml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:tools="http://java.sun.com/jsf/composite/tools"
+	xmlns:ui="http://java.sun.com/jsf/facelets">
+<f:view locale="#{userView.locale}">
+	<h:head>
+		<meta
+			http-equiv="Content-Type"
+			content="text/html; charset=UTF-8" />
+		<title><ui:insert name="title">Default title</ui:insert></title>
+		<!-- **** layout stylesheet **** -->
+		
+		<link
+			rel="stylesheet"
+			type="text/css"
+			href="#{request.contextPath}/resources/style/style.css" />
+
+		<!-- **** colour scheme stylesheet **** -->
+		<link
+			rel="stylesheet"
+			type="text/css"
+			href="#{request.contextPath}/resources/style/green.css" />
+	</h:head>
+	<h:body>
+		<div id="main">
+		<div id="links"><!-- **** INSERT LINKS HERE **** --> <ui:insert name="somelinks">
+			<a href="http://www.insomnia.fi">www.insomnia.fi</a>
+			<tools:loginLogout />
+		</ui:insert></div>
+		<div id="logo">
+		<h1><ui:insert name="globaltitle">Lan Bortal</ui:insert></h1>
+		</div>
+		<div id="menu"><ui:insert name="toplinks">
+			<ui:include src="/layout/toplinks.xhtml" />
+		</ui:insert></div>
+		<div id="content">
+		<div id="column1">
+		<div class="sidebaritem">
+		<div class="sbihead">
+		<h1>additional links</h1>
+		</div>
+		<div class="sbilinks"><!-- **** INSERT ADDITIONAL LINKS HERE **** --> <ui:insert name="sidelinks">
+			<ul>
+				<li><a href="http://www.openwebdesign.org">open web design</a></li>
+				<li><a href="http://www.w3schools.com/xhtml/default.asp">learn XHTML</a></li>
+				<li><a href="http://www.w3schools.com/css/default.asp">learn CSS</a></li>
+				<li><a href="http://www.mozilla.com/firefox">get firefox</a></li>
+			</ul>
+		</ui:insert></div>
+		</div>
+		<div class="sidebaritem">
+		<div class="sbihead">
+		<h1>latest news</h1>
+		</div>
+		<div class="sbicontent"><!-- **** INSERT NEWS ITEMS HERE **** -->
+		<h2>01.09.2006</h2>
+		<p>This is where you can put your latest news.</p>
+		<p><a href="#">read more ...</a></p>
+		<p></p>
+		<p></p>
+		<h2>01.09.2006</h2>
+		<p>This is where you can put your latest news.</p>
+		<p><a href="#">read more ...</a></p>
+		</div>
+		</div>
+
+		<div class="sidebaritem">
+		<div class="sbihead">
+		<h1>other information</h1>
+		</div>
+		<div class="sbicontent"><!-- **** INSERT OTHER INFORMATION HERE **** -->
+		<p>This space can be used for additional information such as a contact phone number, address or maybe even a graphic.</p>
+		</div>
+		</div>
+		</div>
+		<div id="column2"><h:messages globalOnly="true" />
+		<h:messages />
+		 <ui:insert name="content">
+			Default content..
+        </ui:insert></div>
+		</div>
+		<div id="footer"><h:outputText value="#{i18n[copyright]}" /><a href="#">email@emailaddress</a> | <a href="http://validator.w3.org/check?uri=referer">XHTML 1.1</a> | <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a> | <a href="http://www.dcarter.co.uk">design by dcarter</a></div>
+		</div>
+	</h:body>
+</f:view>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/skynett17/template.xhtml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" manifest="offline.appcache">
+<f:view contentType="text/html" locale="#{sessionHandler.locale}">
+
+	<h:head>
+
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+		<title><h:outputText value="#{layoutView.getHeader()}" /></title>
+		<meta name="description" content="Lippukauppa" />
+		<meta name="author" content="CodeCrew ry" />
+		<meta http-equiv="Content-Language" content="fi" />
+
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/skynett17/css/style.css" />
+		<link rel="stylesheet" type="text/css" href="#{request.contextPath}/resources/style/skynett17/css/general.css" />
+		<ui:insert name="headerdata" />
+
+	</h:head>
+
+
+	<h:body>
+
+		<div id="container">
+
+			<div id="header">
+				<div align="right">
+					<!--  <tools:loginLogout />  -->
+				</div>
+				<h:link outcome="/index">
+					<img src="#{request.contextPath}/resources/style/skynett17/img/header.jpg" />
+				</h:link>
+
+			</div>
+			<div id="menu">
+				<p:menubar model="#{primeMenuView.menuModel}" />
+				
+			</div>
+			<div id="content">
+				<div id="primarycontainer">
+					<div id="primarycontent">
+
+						<ui:insert name="title" />
+						<p:messages severity="info" />
+						<h:messages />
+						<ui:repeat var="cont1" value="#{menuView.getPagecontent('top')}">
+							<h:outputText value="#{cont1.content}" escape="false" />
+						</ui:repeat>
+						<ui:insert name="content" />
+						<ui:repeat var="cont1" value="#{menuView.getPagecontent('bottom')}">
+							<h:outputText value="#{cont1.content}" escape="false" />
+						</ui:repeat>
+
+
+
+
+					</div>
+				</div>
+			</div>
+		</div>
+
+		
+	</h:body>
+
+</f:view>
+</html>
+
+

code/MoyaWeb/WebContent/resources/templates/stream1/menu.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" 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:tools="http://java.sun.com/jsf/composite/cditools" xmlns:c="http://java.sun.com/jsp/jstl/core"
+>
+<h:body>
+	<ui:composition>
+		<ul id="mainmenu">
+			<li class="#{i18n[util.concat(thispage,'.pagegroup')] == 'frontpage'?'selected':''}"><h:link outcome="/index"
+					value="#{i18n['topmenu.frontpage']}"
+				/>
+			</li>
+			<tools:isLoggedIn>
+				<li class="#{i18n[util.concat(thispage,'.pagegroup')] == 'user'?'selected':''}"><h:link
+						outcome="/user/edit" value="#{i18n['topmenu.usersPreferences']}"
+					/></li>
+				<li class="#{i18n[util.concat(thispage,'.pagegroup')] == 'shop'?'selected': ''}">
+					<h:link outcome="/product/createBill" value="#{i18n['topmenu.shoppings']}" />
+				</li>
+
+			</tools:isLoggedIn>
+			<tools:canExecute target="POLL">
+				<li class="#{i18n[util.concat(thispage,'.pagegroup')] == 'poll'?'selected': ''}"><h:link outcome="/poll/start"
+						value="#{i18n['topmenu.poll']}"
+					/>
+				</li>
+			</tools:canExecute>
+
+			<!-- <li class="#{i18n[util.concat(thispage,'.pagegroup')] == 'placemap'?'selected':''}"><h:link
+					outcome="/place/placemap" value="#{i18n['topmenu.placemap']}"
+				/></li>
+ -->
+			<tools:canRead target="USER_MANAGEMENT">
+				<li class="#{i18n[util.concat(thispage,'.pagegroup')] == 'admin'?'selected':''}"><h:link
+						outcome="/product/list" value="#{i18n['topmenu.adminfront']}"
+					/>
+				</li>
+				<li class="#{i18n[util.concat(thispage,'.pagegroup')] == 'rfidshop'?'selected':''}"><h:link
+						outcome="/shop/showReaderEvents" value="#{i18n['topmenu.rfidshop']}"
+					/>
+				</li>
+
+			</tools:canRead>
+		</ul>
+
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/stream1/sidebar-admin.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" 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:c="http://java.sun.com/jsp/jstl/core" xmlns:tools="http://java.sun.com/jsf/composite/cditools"
+>
+<h:body>
+	<ui:composition rendered="#{sessionHandler.loggedIn}" template="sidebartemplate.xhtml">
+		<ui:param name="rendered" value="true" />
+		<ui:define name="sidebarcontent">
+			<tools:canRead target="ROLE_MANAGEMENT">
+				<h1>
+					<h:outputText value="#{i18n['sidebar.roles']}" />
+				</h1>
+				<ul>
+					<li><h:link outcome="/role/create" value="#{i18n['sidebar.role.create']}" /></li>
+					<li><h:link outcome="/role/list" value="#{i18n['sidebar.role.list']}" /></li>
+					<li><h:link outcome="/user/createCardTemplate" value="#{i18n['sidebar.cardTemplate.create']}" /></li>
+					<li><h:link outcome="/user/listCardTemplates" value="#{i18n['sidebar.cardTemplate.list']}" /></li>
+
+				</ul>
+			</tools:canRead>
+			<tools:canRead target="BILL">
+				<h1>
+					<h:outputText value="#{i18n['sidebar.bills']}" />
+				</h1>
+				<ul>
+					<li><h:link outcome="/bill/listAll" value="#{i18n['sidebar.bill.listAll']}" /></li>
+					<li><h:link outcome="/bill/billSummary" value="#{i18n['sidebar.bill.summary']}" /></li>
+				</ul>
+			</tools:canRead>
+			<tools:canRead target="USER_MANAGEMENT">
+				<h1>
+					<h:outputText value="#{i18n['sidebar.users']}" />
+				</h1>
+				<ul>
+					<li><h:link outcome="/user/create" value="#{i18n['sidebar.user.create']}" /></li>
+					<li><h:link outcome="/user/list" value="#{i18n['sidebar.user.list']}" /></li>
+				</ul>
+			</tools:canRead>
+			<tools:canRead target="PRODUCT">
+				<h1>
+					<h:outputText value="#{i18n['sidebar.products']}" />
+				</h1>
+				<ul>
+					<li><h:link outcome="/product/create" value="#{i18n['sidebar.product.create']}" /></li>
+					<li><h:link outcome="/product/list" value="#{i18n['sidebar.product.list']}" /></li>
+				</ul>
+
+			</tools:canRead>
+
+			<tools:canRead target="MAP">
+				<h1>
+					<h:outputText value="#{i18n['sidebar.maps']}" />
+				</h1>
+				<ul>
+					<li><h:link outcome="/map/list" value="#{i18n['sidebar.map.list']}" /></li>
+				</ul>
+			</tools:canRead>
+
+
+			<h1>
+				<h:outputText value="#{i18n['sidebar.other']}" />
+			</h1>
+			<ul>
+				<li><h:link outcome="/eventorg/list" value="#{i18n['sidebar.eventorg.list']}" /></li>
+				<li><h:link outcome="/utils/flushCache" value="#{i18n['sidebar.utils.flushCache']}" /></li>
+				<li><h:link outcome="/generateTestData" value="#{i18n['sidebar.utils.testdata']}" /></li>
+
+			</ul>
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/stream1/sidebar-frontpage.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"
+	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:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="sidebartemplate.xhtml">
+		<ui:param name="rendered" value="#{!sessionHandler.loggedIn}" />		
+		<ui:define name="sidebarcontent">
+			<ul>
+				<li><h:link outcome="/user/create.xhtml" value="#{i18n['sidebar.createuser']}"/></li>
+			</ul>
+
+		</ui:define>
+	</ui:composition>
+	</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/stream1/sidebar-game.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" 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:tools="http://java.sun.com/jsf/composite/cditools" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="sidebartemplate.xhtml">
+		<ui:param name="rendered" value="false" />
+		<ui:define name="sidebarcontent">
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/stream1/sidebar-login.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"
+	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:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="sidebartemplate.xhtml">
+		<ui:define name="sidebarcontent">
+			<ul>
+				<li><h:link outcome="/user/create.xhtml" value="#{i18n['sidebar.user.create']}"/></li>
+			</ul>
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/stream1/sidebar-placemap.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" 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:tools="http://java.sun.com/jsf/composite/cditools" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="sidebartemplate.xhtml">
+		<ui:param name="rendered" value="false" />
+		<ui:define name="sidebarcontent">
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/stream1/sidebar-poll.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"
+	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:tools="http://java.sun.com/jsf/composite/cditools"
+	xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="sidebartemplate.xhtml">
+		<ui:param name="rendered" value="false" />
+		<ui:define name="sidebarcontent">
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/stream1/sidebar-rfidshop.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" 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:tools="http://java.sun.com/jsf/composite/cditools" xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="sidebartemplate.xhtml">
+		<ui:param name="rendered" value="true" />
+		<ui:define name="sidebarcontent">
+			<ul>
+
+				<li><h:link outcome="/shop/listReaders" value="#{i18n['sidebar.shop.readerlist']}" /></li>
+				<li><h:link outcome="/shop/showReaderEvents" value="#{i18n['sidebar.shop.readerEvents']}" /></li>
+			</ul>
+
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/stream1/sidebar-shop.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"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:h="http://java.sun.com/jsf/html"
+    xmlns:tools="http://java.sun.com/jsf/composite/cditools"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="sidebartemplate.xhtml">
+				<ui:param name="rendered" value="true" />		
+		
+		<ui:define name="sidebarcontent">
+			<ul>
+				
+				<li><h:link outcome="/bill/list" value="#{i18n['sidebar.bill.list']}"/></li>
+				
+ 			</ul>
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/stream1/sidebar-user.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"
+	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:tools="http://java.sun.com/jsf/composite/cditools"
+	xmlns:c="http://java.sun.com/jsp/jstl/core">
+<h:body>
+	<ui:composition template="sidebartemplate.xhtml">
+		<ui:param name="rendered" value="#{sessionHandler.isLoggedIn()}" />		
+		<ui:define name="sidebarcontent">
+			<ul>	
+				<li><h:link outcome="/user/sendPicture" value="#{i18n['user.sendPicture']}"/></li>
+				<li><h:link outcome="/user/changePassword" value="#{i18n['user.changePassword']}"/></li>
+				<li><h:link outcome="/user/accountEvents" value="#{i18n['user.accountEvents']}"/></li>
+				<li><h:link outcome="/place/myGroups" value="#{i18n['user.myGroups']}"/></li>
+				<li><h:link outcome="/place/insertToken" value="#{i18n['user.insertToken']}"/></li>
+
+			</ul>
+
+		</ui:define>
+	</ui:composition>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/stream1/sidebartemplate.xhtml

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core">
+<h:head>
+	<title></title>
+</h:head>
+<h:body>
+	<ui:component>
+		<c:if test="#{rendered}">
+		<ui:insert name="sidebarcontent" />
+		</c:if>
+	</ui:component>
+</h:body>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/stream1/template.xhtml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:tools="http://java.sun.com/jsf/composite/cditools"
+	xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:c="http://java.sun.com/jsp/jstl/core">
+
+<f:view locale="#{sessionHandler.locale}">
+
+	<f:metadata>
+		<f:viewParam name="userid" value="#{userView.userid}" />
+	</f:metadata>
+	<ui:insert name="metadata" />
+	<h:head>
+		<link href="#{request.contextPath}/resources/style/stream10/intra_style.css" rel="stylesheet" type="text/css" />
+		<meta http-equiv="CACHE-CONTROL" content="NO-CACHE" />
+		<meta http-equiv="PRAGMA" content="NO-CACHE" />
+		<meta http-equiv="expires" content="0" />
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+		<title><h:outputText value="#{i18n['global.eventname']}" /> - <h:outputText value="#{i18n[util.concat(thispage,'.header') ] }" /></title>
+		<ui:insert name="headerdata" />
+	</h:head>
+	<h:body>
+		<div id="topheader">
+			<img src="#{request.contextPath}/resources/style/stream10/header.png" />
+		</div>
+		<div id="container">
+			<div id="page">
+				<div id="leftnav">
+					<tools:isLoggedIn>
+						<h1>#{sessionHandler.currentUser.nick}</h1>
+					</tools:isLoggedIn>
+					<ui:include src="menu.xhtml" />
+					<hr />
+					<tools:isLoggedIn>
+						<ui:include src="sidebar-#{i18n[util.concat(thispage,'.pagegroup')]}.xhtml" />
+					</tools:isLoggedIn>
+
+					<ul>
+						<li><tools:loginLogout /></li>
+					</ul>
+				</div>
+				<div id="content">
+					<h:messages globalOnly="true" />
+					<ui:insert name="content" />
+				</div>
+				<div id="copyright">&copy; 2009 Stream Ry</div>
+			</div>
+		</div>
+	</h:body>
+</f:view>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/resources/templates/template1/template.xhtml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:tools="http://java.sun.com/jsf/composite/cditools"
+	xmlns:ui="http://java.sun.com/jsf/facelets"
+	xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:p="http://primefaces.org/ui">
+
+<f:view contentType="text/html" locale="#{sessionHandler.locale}">
+
+	<h:head>
+
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+		<title><h:outputText value="#{layoutView.getHeader()}" /></title>
+		<meta name="description" content="Lippukauppa" />
+		<meta name="author" content="CodeCrew ry" />
+		<meta http-equiv="Content-Language" content="fi" />
+
+		<link rel="stylesheet" type="text/css"
+			href="#{request.contextPath}/resources/style/template1/css/style.css" />
+		<link rel="stylesheet" type="text/css"
+			href="#{request.contextPath}/resources/style/template1/css/general.css" />
+		<ui:insert name="headerdata" />
+
+	</h:head>
+
+
+	<h:body>
+		<div id="page-container">
+			<div id="logo">
+				<h:link outcome="/index">
+					<c:choose>
+						<c:when test="#{sessionHandler.isInDevelopmentMode()}">
+							<img
+								src="#{request.contextPath}/resources/style/insomnia2/img/devel_logo.png" />
+						</c:when>
+						<c:otherwise>
+							<p:graphicImage rendered="#{!empty layoutView.headerimage}"
+								value="#{layoutView.headerimage}" />
+							<ui:fragment rendered="#{empty layoutView.headerimage}">
+								<h1>
+									<h:outputText value="#{layoutView.headertext}" />
+								</h1>
+							</ui:fragment>
+						</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}" />
+					<div>
+						<tools:loginLogout />
+					</div>
+				</div>
+
+			</div>
+
+			<div id="main">
+
+				<p:menubar model="#{primeMenuView.menuModel}" />
+
+				<div class="container top">
+					<h:link rendered="#{layoutView.manageContent}"
+						styleClass="editorlink" value="#{i18n['layout.editTop']}"
+						outcome="/pages/manage">
+						<f:param name="pagename" value="#{layoutView.pagepath}:top" />
+					</h:link>
+				</div>
+
+				<div class="container clearfix">
+
+					<ui:fragment rendered="#{menuView.getMenu(2).size() > 1}">
+						<div id="right">
+							<ul>
+								<ui:repeat var="menuitem" value="#{menuView.getMenu(2)}">
+									<h:outputText rendered="#{!empty menuitem.header}"
+										value="&lt;/ul>&lt;h1>#{i18n[menuitem.header]}&lt;/h1>&lt;ul>"
+										escape="false" />
+									<li><h:link outcome="#{menuitem.outcome}"
+											value="#{i18n[menuitem.navigation.key]}"
+											styleClass="#{menuitem.selected?'active':''}" /></li>
+								</ui:repeat>
+							</ul>
+						</div>
+					</ui:fragment>
+
+					<div id="left">
+						<ui:insert name="title" />
+						<p:messages severity="info" />
+						<h:messages />
+						<ui:repeat var="cont1" value="#{menuView.getPagecontent('top')}">
+							<h:outputText value="#{cont1.content}" escape="false" />
+						</ui:repeat>
+						<ui:insert name="content" />
+						<ui:repeat var="cont1"
+							value="#{menuView.getPagecontent('bottom')}">
+							<h:outputText value="#{cont1.content}" escape="false" />
+						</ui:repeat>
+					</div>
+
+				</div>
+				<div class="container bottom">
+					<h:link rendered="#{layoutView.manageContent}"
+						styleClass="editorlink" value="#{i18n['layout.editBottom']}"
+						outcome="/pages/manage">
+						<f:param name="pagename" value="#{layoutView.pagepath}:bottom" />
+					</h:link>
+				</div>
+			</div>
+		</div>
+			
+	</h:body>
+
+</f:view>
+</html>
\ No newline at end of file

code/MoyaWeb/WebContent/role/create.xhtml

@@ -7,7 +7,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 
-<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+<ui:composition template="#{sessionHandler.template}">
 	<ui:param name="thispage" value="page.role.create" />
 	<f:metadata>
 		<f:event type="preRenderView" listener="#{roleView.initForCreate()}" />

code/MoyaWeb/WebContent/role/edit.xhtml

@@ -6,7 +6,7 @@
 	xmlns:role="http://java.sun.com/jsf/composite/cditools/role" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="roleid" value="#{roleView.roleid}" />
 			<f:event type="preRenderView" listener="#{roleView.initViewFromId()}" />

code/MoyaWeb/WebContent/role/list.xhtml

@@ -6,7 +6,7 @@
 	xmlns:role="http://java.sun.com/jsf/composite/cditools/role" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.role.list" />
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{roleView.permissionRead()}" />

code/MoyaWeb/WebContent/salespoint/list.xhtml

@@ -8,7 +8,7 @@
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{salespointListView.init}" />

code/MoyaWeb/WebContent/shop/assocToUser.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="eventid" value="#{readerView.eventid}" />
 			<f:event type="preRenderView" listener="#{readerView.initUserassocView}" />

code/MoyaWeb/WebContent/shop/createBill.xhtml

@@ -8,7 +8,7 @@
 
 <h:body>
 	
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{productShopView.initBillView}" />

code/MoyaWeb/WebContent/shop/createReader.xhtml

@@ -7,7 +7,7 @@ xmlns:h="http://java.sun.com/jsf/html"
 xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 
 			<f:event type="preRenderView" listener="#{readerView.initCreateReader}" />

code/MoyaWeb/WebContent/shop/editGame.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 			<h:form id="editform">
 				<h:panelGrid columns="2">

code/MoyaWeb/WebContent/shop/editReader.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
 	 xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 	<f:metadata>
 			<f:viewParam name="readerId" value="#{readerView.readerid}" />
 			<f:event type="preRenderView" listener="#{readerView.initEditReader}" />

code/MoyaWeb/WebContent/shop/foodToUser.xhtml

@@ -4,7 +4,7 @@
 <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:products="http://java.sun.com/jsf/composite/cditools/products" xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
  			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/shop/listReaders.xhtml

@@ -6,7 +6,7 @@
 	xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
 	>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 
 			<f:event type="preRenderView" listener="#{readerListDataView.initView}" />

code/MoyaWeb/WebContent/shop/rfidListener.xhtml

@@ -7,7 +7,7 @@
 	<title></title>
 </h:head>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="metadata">
 			<f:metadata>
 				<f:viewParam name="reader" value="#{rfidView.reader}" />

code/MoyaWeb/WebContent/shop/shopToUser.xhtml

@@ -7,7 +7,7 @@
 	xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop"
 	>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{productShopView.initShopView}" />

code/MoyaWeb/WebContent/shop/showCreatedBill.xhtml

@@ -7,7 +7,7 @@
 
 <h:body>
 
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="title">
 			<h1>#{i18n['page.product.validateBillProducts.header']}</h1>
 		</ui:define>

code/MoyaWeb/WebContent/shop/showReaderEvents.xhtml

@@ -7,7 +7,7 @@
 	xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
 	>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="readerId" value="#{readerNameContainer.readerId}" />
 			<f:event type="preRenderView" listener="#{readerView.initReaderList}" />

code/MoyaWeb/WebContent/svm/failure.xhtml

@@ -5,7 +5,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="ORDER_NUMBER" value="#{svmView.orderNumber}" />
 			<f:viewParam name="TIMESTAMP" value="#{svmView.timestamp}" />

code/MoyaWeb/WebContent/svm/notification.xhtml

@@ -5,7 +5,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="ORDER_NUMBER" value="#{svmView.orderNumber}" />
 			<f:viewParam name="TIMESTAMP" value="#{svmView.timestamp}" />

code/MoyaWeb/WebContent/svm/pending.xhtml

@@ -5,7 +5,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="ORDER_NUMBER" value="#{svmView.orderNumber}" />
 			<f:viewParam name="TIMESTAMP" value="#{svmView.timestamp}" />

code/MoyaWeb/WebContent/svm/success.xhtml

@@ -5,7 +5,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="ORDER_NUMBER" value="#{svmView.orderNumber}" />
 			<f:viewParam name="TIMESTAMP" value="#{svmView.timestamp}" />

code/MoyaWeb/WebContent/user/acceptInvite.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{inviteAcceptView.initView}" />
 			<f:viewParam name="token" value="#{inviteAcceptView.token}" />

code/MoyaWeb/WebContent/user/accountEvents.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/user/adminSendImage.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.admin.sendimage" />
 		<ui:define name="content">
 

code/MoyaWeb/WebContent/user/assocToUser.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/user/changePassword.xhtml

@@ -6,7 +6,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/user/commitImport.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 
 			<h:form id="wrapform">

code/MoyaWeb/WebContent/user/create.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{userView.initCreateView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/user/created.xhtml

@@ -7,7 +7,7 @@
 	xmlns:login="http://java.sun.com/jsf/composite/tools/login"
       xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.user.create" />
 		<ui:define name="content">
 			<p>#{i18n['user.createdmessage']}</p> 		

code/MoyaWeb/WebContent/user/edit.xhtml

@@ -4,7 +4,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:account="http://java.sun.com/jsf/composite/cditools/account"
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/user/import.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{importView.initImport}" />
 		</f:metadata>

code/MoyaWeb/WebContent/user/invite.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/tools/user"
 	xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 
 		<ui:define name="title">
 			<h1>#{i18n['user.page.invite']}</h1>

code/MoyaWeb/WebContent/user/sendPicture.xhtml

@@ -5,7 +5,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.user.create" />
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />

code/MoyaWeb/WebContent/useradmin/accountEvents.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/useradmin/adminSendImage.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.admin.sendimage" />
 		<ui:define name="content">
 

code/MoyaWeb/WebContent/useradmin/assocToUser.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/useradmin/changePassword.xhtml

@@ -6,7 +6,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/useradmin/create.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core" xmlns:c="http://java.sun.com/jsp/jstl/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{userView.initCreateView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/useradmin/createCardTemplate.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{cardView.initCardCreate}" />
 		</f:metadata>

code/MoyaWeb/WebContent/useradmin/created.xhtml

@@ -7,7 +7,7 @@
 	xmlns:login="http://java.sun.com/jsf/composite/tools/login"
       xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.user.create" />
 		<ui:define name="content">
 			<p>#{i18n['user.createdmessage']}</p> 		

code/MoyaWeb/WebContent/useradmin/edit.xhtml

@@ -4,7 +4,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:account="http://java.sun.com/jsf/composite/cditools/account"
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/useradmin/editAccountevent.xhtml

@@ -4,7 +4,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:account="http://java.sun.com/jsf/composite/cditools/account"
 	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="id" value="#{accountEventView.accountid}" />
 			<f:event type="preRenderView" listener="#{accountEventView.initView}" />

code/MoyaWeb/WebContent/useradmin/editCardTemplate.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/tools/user"
 	xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="templateid" value="#{cardView.templateId}" />
 			<f:event type="preRenderView" listener="#{cardView.initCardTemplate}" />

code/MoyaWeb/WebContent/useradmin/foodwaveProducts.xhtml

@@ -11,7 +11,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />			
 			<f:viewParam name="foodwaveid" value="#{foodWaveFoodView.foodwaveid}" />

code/MoyaWeb/WebContent/useradmin/foodwaveshop.xhtml

@@ -11,7 +11,7 @@
 	xmlns:p="http://primefaces.org/ui">
 <h:body>
 	<ui:composition
-		template="/layout/#{sessionHandler.layout}/template.xhtml">
+		template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:viewParam name="templateid" value="#{foodWaveView.templateId}" />			

code/MoyaWeb/WebContent/useradmin/list.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:p="http://primefaces.org/ui" xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="page" value="#{userSearchView.page}" />
 			<f:viewParam name="pagesize" value="#{userSearchView.pagesize}" />

code/MoyaWeb/WebContent/useradmin/listCardTemplates.xhtml

@@ -6,7 +6,7 @@
 	xmlns:f="http://java.sun.com/jsf/core"
 >
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/useradmin/searchUser.xhtml

@@ -8,7 +8,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/tools/user"
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.user.search" />
 		
 		<ui:define name="content">

code/MoyaWeb/WebContent/useradmin/sendPicture.xhtml

@@ -7,7 +7,7 @@
 	xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
 	>
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.user.create" />
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />

code/MoyaWeb/WebContent/useradmin/showTakePicture.xhtml

@@ -5,7 +5,7 @@
 	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui" xmlns:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:shop="http://java.sun.com/jsf/composite/cditools/shop">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.user.create" />
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />

code/MoyaWeb/WebContent/useradmin/userCards.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/cditools/user"
 	xmlns:f="http://java.sun.com/jsf/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="userid" value="#{userView.userid}" />
 			<f:event type="preRenderView" listener="#{userView.initView}" />

code/MoyaWeb/WebContent/useradmin/userCartShow.xhtml

@@ -4,7 +4,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:account="http://java.sun.com/jsf/composite/cditools/account"
 	xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:p="http://primefaces.org/ui">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<!-- f:event type="preRenderView" listener="#{userCartView.initView}" />
 			 -->

code/MoyaWeb/WebContent/useradmin/validateUser.xhtml

@@ -4,7 +4,7 @@
 	xmlns:users="http://java.sun.com/jsf/composite/cditools/user" xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:account="http://java.sun.com/jsf/composite/cditools/account"
 	xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{userView.initValidateView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/utils/flushCache.xhtml

@@ -3,7 +3,7 @@
 <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:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:define name="content">
 		
 		 	#{sessionHandler.flushCache()}

code/MoyaWeb/WebContent/utils/index.xhtml

@@ -4,7 +4,7 @@
 <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:users="http://java.sun.com/jsf/composite/tools/user" xmlns:c="http://java.sun.com/jsp/jstl/core">
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<ui:param name="thispage" value="page.eventorg.edit" />
 		<ui:define name="content">
 		

code/MoyaWeb/WebContent/utils/reindexCompass.xhtml

@@ -8,7 +8,7 @@
       xmlns:users="http://java.sun.com/jsf/composite/tools/user"
       xmlns:c="http://java.sun.com/jsp/jstl/core">
  <h:body>
-<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+<ui:composition template="#{sessionHandler.template}">
 	<ui:param name="thispage" value="page.eventorg.edit" />
 		<ui:define name="content">
 		 	#{sessionHandler.reindexCompass()}

code/MoyaWeb/WebContent/viewExpired.xhtml

@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"
 >
 
-<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+<ui:composition template="#{sessionHandler.template}">
 	<ui:param name="thispage" value="page.viewexpired" />
 	<ui:define name="content">
 		<h1>#{i18n['viewexpired.title']}</h1>

code/MoyaWeb/WebContent/voting/addentry.xhtml

@@ -7,7 +7,7 @@
 	xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="compoId" value="#{votingCompoAddEntryView.compoId}"></f:viewParam>
 			<f:event type="preRenderView" listener="#{votingCompoAddEntryView.initView()}" />

code/MoyaWeb/WebContent/voting/compolist.xhtml

@@ -5,7 +5,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{compoView.initListView()}" />
 		</f:metadata>

code/MoyaWeb/WebContent/voting/create.xhtml

@@ -7,7 +7,7 @@
 	xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{votingCreateView.initCreate}" />
 		</f:metadata>

code/MoyaWeb/WebContent/voting/details.xhtml

@@ -5,7 +5,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="compoId" value="#{votingDetailsView.compoId}" />
 			<!-- <f:viewParam name="compoId" value="#{votingDetailsView.compoId2}" /> -->

code/MoyaWeb/WebContent/voting/myEntries.xhtml

@@ -5,7 +5,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:event type="preRenderView" listener="#{userView.initView}" />
 		</f:metadata>

code/MoyaWeb/WebContent/voting/submitEntry.xhtml

@@ -5,7 +5,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 		<f:metadata>
 			<f:viewParam name="compoId" value="#{compoView.compoId}" />
 			<f:viewParam name="entryId" value="#{compoView.entryId}" />

code/MoyaWeb/WebContent/voting/vote.xhtml

@@ -5,7 +5,7 @@
 	xmlns:tools="http://java.sun.com/jsf/composite/cditools" xmlns:f="http://java.sun.com/jsf/core" xmlns:p="http://primefaces.org/ui">
 
 <h:body>
-	<ui:composition template="/layout/#{sessionHandler.layout}/template.xhtml">
+	<ui:composition template="#{sessionHandler.template}">
 
 		<ui:define name="content">
 			<!-- <h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" /> -->

code/MoyaWeb/src/fi/codecrew/moya/handler/SessionHandler.java

@@ -71,14 +71,14 @@ public class SessionHandler {
 		return template;
 	}
 
-	public String getLayout() {
+	public String getTemplate() {
 		if (template == null) {
 			template = eventbean.getPropertyString(LanEventPropertyKey.EVENT_LAYOUT);
 		}
 		if (template == null) {
 			template = "template1";
 		}
-		return template;
+		return "/resources/templates/"+template+"/template.xhtml";
 	}
 
 	// public boolean hasPermission(String target, String permission) {