diff --git a/mysql.properties b/mysql.properties
index bbfb207b..d12e6435 100644
--- a/mysql.properties
+++ b/mysql.properties
@@ -4,8 +4,8 @@ DBmaxWait=10000
 
 DBhost=localhost
 DBport=3306
-DBusername=root
-DBpassword=root
+DBusername=utente
+DBpassword=utente
 DBdump=sql
 DBdriverClassName=com.mysql.jdbc.Driver
 DBurl=jdbc:mysql://localhost:3306/locanda
diff --git a/pom.xml b/pom.xml
index 2f805d60..982d85f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -475,11 +475,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.eclipse.birt.runtime.3_7_1</groupId>
-			<artifactId>org.apache.xerces</artifactId>
-			<version>2.9.0</version>
-		</dependency>
 	</dependencies>
 	<organization>
 		<name>Sardegna Ricerche</name>
diff --git a/src/global_it.properties b/src/global_it.properties
index d2347a96..8ee80233 100644
--- a/src/global_it.properties
+++ b/src/global_it.properties
@@ -93,6 +93,10 @@ city = Citt\u00E0
 
 Citizenship = Cittadinanza
 
+IdentificationTypeProvince = Provincia rilascio documento 
+
+IdentificationTypePlace = Luogo rilascio documento 
+
 code = Codice
 
 confirmed = Confermato
diff --git a/webroot/WEB-INF/jsp/contents/guests_form.jsp b/webroot/WEB-INF/jsp/contents/guests_form.jsp
index 97b727de..daae9f08 100644
--- a/webroot/WEB-INF/jsp/contents/guests_form.jsp
+++ b/webroot/WEB-INF/jsp/contents/guests_form.jsp
@@ -69,10 +69,10 @@
 	<div id="col1" role="complementary">
 		<div class="clearfix" id="col1_content">
 			<div>
-				<button class="btn_add_form">
+				<button class="btn_add_form" style="display:none;">
 					<s:text name="addNew" />
 				</button>
-				<button class="btn_select_guest" id="btnselectG">
+				<button class="btn_select_guest" style="display:none;" id="btnselectG">
 					<s:text name="selectGuest" />
 				</button>
 			</div>
diff --git a/webroot/WEB-INF/jsp/export.jsp b/webroot/WEB-INF/jsp/export.jsp
index 67f124db..c18d8b1e 100644
--- a/webroot/WEB-INF/jsp/export.jsp
+++ b/webroot/WEB-INF/jsp/export.jsp
@@ -17,10 +17,22 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib uri="/struts-tags" prefix="s" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
+<script>
+	Entity = {
+		name : "export",
+		model : null,
+		collection : null,
+		editView : null,
+		idStructure : <s:property value="#session.user.structure.id"/>
+	};
+</script>
 		
 <jsp:include page="layout/header_menu.jsp"/>
       
-      
+<jsp:include page="templates/export.mustache.jsp"/>
+
+<div id="main">
+	<div id="export-widget"></div>
+</div>
       
 <jsp:include page="layout/footer.jsp" />     
\ No newline at end of file
diff --git a/webroot/WEB-INF/jsp/templates/export.mustache.jsp b/webroot/WEB-INF/jsp/templates/export.mustache.jsp
new file mode 100755
index 00000000..215217e8
--- /dev/null
+++ b/webroot/WEB-INF/jsp/templates/export.mustache.jsp
@@ -0,0 +1,46 @@
+<%--
+ *
+ *  Copyright 2011 - Sardegna Ricerche, Distretto ICT, Pula, Italy
+ *
+ * Licensed under the EUPL, Version 1.1.
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ *
+ *  http://www.osor.eu/eupl
+ *
+ * Unless required by applicable law or agreed to in  writing, software distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and limitations under the Licence.
+ * In case of controversy the competent court is the Court of Cagliari (Italy).
+--%>
+<?xml version="1.0" encoding="UTF-8" ?>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ taglib uri="/struts-tags" prefix="s" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+   
+<script id="export-template" type="text/x-handlebars-template">
+	<div class="float_left">
+		<div class="clear">
+			<select id="exportsList">
+				<option value="">Fake select</option>
+				<option value="1">Fake select</option>
+			</select>
+		</div>
+		<div class="clear">
+			<input type="text" id="dateExport" name="dateExport" value="" class="datepicker required hasDatepicker" readonly="readonly">
+		</div>
+		<div class="clear">
+			<label id="startexportdate">Dalle...</label>
+			<label id="endexportdate">Alle...</label>
+		</div>
+	</div>
+	<div class="float_left">
+		<button class="btn_export_questura">
+			<s:text name="exportQuestura" />
+		</button>
+		<button class="btn_export_sired">
+			<s:text name="exportSired" />
+		</button>
+	</div>
+</script>
\ No newline at end of file
diff --git a/webroot/WEB-INF/jsp/templates/guest.mustache.jsp b/webroot/WEB-INF/jsp/templates/guest.mustache.jsp
index d2b72545..50f390f3 100644
--- a/webroot/WEB-INF/jsp/templates/guest.mustache.jsp
+++ b/webroot/WEB-INF/jsp/templates/guest.mustache.jsp
@@ -20,7 +20,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    
     <script id="edit-template" type="text/x-handlebars-template">
-			<form id="edit-form" class="yform json full" role="application" style="max-height:400px; overflow-y:scroll;">
+			<form id="edit-form" class="yform json full" role="application" style="max-height:300px; overflow-y:scroll;">
         		<div class="c50l">
                   	<div class="type-text">	
                   		<label for="FormFirstName"><s:text name="firstName"/><sup title="<s:text name="thisFileMandatory"/>.">*</sup></label>
@@ -40,22 +40,37 @@
                   		<label for="FormBirthDay"><s:text name="birthDay"/>:</label>
 						<input type="text" name="birthDate" value="{{birthDate}}"  class="datepicker"/>
 					</div>
-				  	<div class="type-select">           
-       				 	<label><s:text name="Citizenship"/>:</label>
-                	  	<select name="id_citizenship" id="FormCitizenship" size="1" aria-required="true">
-							{{#availableCitizenships}}<option value="{{id}}" {{#selected}}selected="selected"{{/selected}}>{{description}}</option>{{/availableCitizenships}}
+					<div class="type-select">
+                  		<label><s:text name="Citizenship"/>:</label>
+                	  	<select name="id_citizenship" id="Formid_countryOfCitizenship" size="1" aria-required="true">
+							{{#availableCountriesCitizenship}}<option value="{{id}}" {{#selected}}selected="selected"{{/selected}}>{{description}}</option>{{/availableCountriesCitizenship}}
 						</select>
-      		      	</div>
-      		      	<div class="type-select">
-                  		<label><s:text name="IdentificationType"/>:</label>
+					</div>
+					<div class="type-select" id="FormIdentificationTypeContainer">
+						<label><s:text name="IdentificationType"/>:</label>
 						<select name="id_idType" id="IdentificationTypeSelector">
+							<option value="">Seleziona il tipo di documento</option>
 							{{#availableIdentificationTypes}}<option value="{{id}}" {{#selected}}selected="selected"{{/selected}}>{{description}}</option>{{/availableIdentificationTypes}}
 						</select>
+						<label for="FormIdNumber"><s:text name="idNumber"/></label>
+                  		<input type="text"name="idNumber" id="FormIdNumber" value="{{idNumber}}" aria-required="true"/>
 					</div>
-					<div class="type-text">           
-       				  	<label for="FormIdNumber"><s:text name="idNumber"/></label>
-                      	<input type="text"name="idNumber" id="FormIdNumber" value="{{idNumber}}" aria-required="true"/>
-      		      	</div>
+					<div class="type-select" id="FormIdentificationType">
+						<input type="hidden" name="id_idPlace" id="id_idPlace" value="{{#id_idPlace}}{{id_idPlace}}{{/id_idPlace}}" />
+						<div id="IdentificationTypeProvinceSelector" class="clear none">
+							<label><s:text name="IdentificationTypeProvince"/>:</label>
+							<select name="FormIdentificationTypeProvince" id="FormIdentificationTypeProvinceSelector">
+								<option value="">Seleziona la provincia</option>
+								{{#ITProvinces}}
+									<option value="{{code}}">{{description}}</option>
+								{{/ITProvinces}}
+							</select>
+						</div>
+						<div id="IdentificationTypePlaceSelector" class="clear none">
+							<label><s:text name="IdentificationTypePlace"/>:</label>
+							<select id="FormIdentificationTypePlace" aria-required="true"></select>
+	      		      	</div>
+             	 	</div>
                   	<div class="type-button">
                 	  	<button class="btn_save"><s:text name="save"/></button>
                 	  	<button class="btn_reset"><s:text name="cancel"/></button>
diff --git a/webroot/WEB-INF/jsp/templates/housed.mustache.jsp b/webroot/WEB-INF/jsp/templates/housed.mustache.jsp
index a456064e..d26f1bc5 100644
--- a/webroot/WEB-INF/jsp/templates/housed.mustache.jsp
+++ b/webroot/WEB-INF/jsp/templates/housed.mustache.jsp
@@ -22,7 +22,7 @@
 	<script id="selectbooker-template" type="text/x-handlebars-template">
 		<a class="set_booker" href="#"><s:text name="selectBooker" /></a>
 		{{#data}}
-			<div class="clear">
+			<div class="clear bookerdetails">
 				<ul>
 					<li>
 						<b><s:text name="firstName"/>:</b> {{firstName}}<br/>
@@ -56,7 +56,7 @@
 	  					<input type="radio" name="groupType" value="CAPOFAMIGLIA" {{#data.family}}checked="checked"{{/data.family}} /> Famiglia<br/>
 						<input type="radio" name="groupType" value="CAPOGRUPPO" {{#data.group}}checked="checked"{{/data.group}} /> Gruppo
 	  				</div>
-	  				<div class="float_left">
+	  				<div class="float_left groupleaderdetails">
 						<ul>
 							<li>
 								<b><s:text name="firstName"/>:</b> {{firstName}}<br/>
@@ -75,6 +75,9 @@
 							</li>
 						</ul>
 					</div>
+					<div class="float_left">
+						<img title="Rimuovi" alt="Rimuovi" src="images/delete.png" class="groupleader_clear">
+					</div>
 				</div>
 		{{/data}}
 		{{^data}}
@@ -99,9 +102,11 @@
 				<li>
 					<div class="row-item">
 						<input type="hidden" name="housedid" value="{{id}}"/>
+						<input type="hidden" name="guestid" value="{{guest.id}}"/>
 					  	<ul>
-							<li><b><s:text name="firstName"/>: </b>{{guest.firstName}}</li>
-							<li><b><s:text name="lastName"/>: </b>{{guest.lastName}}</li><li><b><s:text name="notes"/>: </b>{{guest.notes}}</li>
+							<li class="houseddetails"><b><s:text name="firstName"/>: </b>{{guest.firstName}}</li>
+							<li class="houseddetails"><b><s:text name="lastName"/>: </b>{{guest.lastName}}</li>
+							<li class="houseddetails"><b><s:text name="notes"/>: </b>{{guest.notes}}</li>
 					  		<li>
 					  			<div class="housed_accordion">
 					  				<h2><a href="#"><s:text name="selectHousedDates" /></a></h2>
diff --git a/webroot/css/reset.css b/webroot/css/reset.css
index 2e36b8d1..b6b61fda 100644
--- a/webroot/css/reset.css
+++ b/webroot/css/reset.css
@@ -107,6 +107,10 @@ text-align:left;
 	float:right;
 }
 
+.clear {
+	clear:both;
+}
+
 .none {
 	display:none;
 }
@@ -151,4 +155,12 @@ text-align:left;
 
 #selecthouseds-list ul li {
 	margin: 0px !important;
+}
+
+.bookerdetails {
+	cursor:pointer;
+}
+
+.groupleaderdetails {
+	cursor:pointer;
 }
\ No newline at end of file
diff --git a/webroot/js/collections/export.js b/webroot/js/collections/export.js
new file mode 100644
index 00000000..e69de29b
diff --git a/webroot/js/collections/guest.js b/webroot/js/collections/guest.js
index d3622798..b6b25bd8 100644
--- a/webroot/js/collections/guest.js
+++ b/webroot/js/collections/guest.js
@@ -35,6 +35,8 @@ window.Guests = Backbone.Collection.extend({
     url: function () {
     	if (GetQueryStringParams('housed')=='true') {
     		return 'rest/guests/structure/' + this.idWrapper +  '/search' + this.from + this.to + '?term=' + this.term +"&housed=true";
+    	} else if (GetQueryStringParams('id')) {
+    		return 'rest/guests/'+GetQueryStringParams('id');
     	} else {
     		return 'rest/guests/structure/' + this.idWrapper +  '/search' + this.from + this.to + '?term=' + this.term ;
     	}
diff --git a/webroot/js/helpers/common.js b/webroot/js/helpers/common.js
index 0885e2e4..404bbcb9 100644
--- a/webroot/js/helpers/common.js
+++ b/webroot/js/helpers/common.js
@@ -268,4 +268,5 @@ function GetQueryStringParams(sParam) {
     		return sParameterName[1];
     	}
     }
+    return null;
 }
\ No newline at end of file
diff --git a/webroot/js/models/export.js b/webroot/js/models/export.js
new file mode 100644
index 00000000..e69de29b
diff --git a/webroot/js/views/export.js b/webroot/js/views/export.js
new file mode 100755
index 00000000..2ac2569c
--- /dev/null
+++ b/webroot/js/views/export.js
@@ -0,0 +1,57 @@
+/*
+ * @class ExportView
+ * @parent Backbone.View
+ * @constructor
+ * View for export.
+ * @tag views
+ * @author LabOpenSource
+ */
+window.ExportView = Backbone.View.extend({
+	el: $('#export-widget'),
+	events: {
+		'change #exportsList':'selectedExport',
+		'click .btn_export_questura':'doExportQuestura',
+		'click .btn_export_sired':'doExportSired',
+	},
+	initialize: function(options) {
+		this.render();
+	},
+	render: function() {
+		$(this.el).html(Mustache.to_html($('#export-template').html(), {}));
+		$(".btn_export_questura").button({
+            icons: {
+                primary: "ui-icon-check"
+            }
+        });
+		$(".btn_export_sired").button({
+            icons: {
+                primary: "ui-icon-check"
+            }
+        });
+		
+		// initialize and render datepickers.
+        this.$(".datepicker").removeClass('hasDatepicker').datepicker("destroy");
+		this.$( 'input[name="dateExport"]' ).datepicker({
+ 			maxDate:  new Date(),
+			changeMonth: true,
+			changeYear: true,
+            showOn: "both",
+            buttonImage: "images/calendar.gif",
+            buttonImageOnly: true,
+            dateFormat: 'dd/mm/yy',
+		});
+	},
+	selectedExport: function(e) {
+		alert('sssssssse');
+	},
+	doExportQuestura: function(e) {
+		alert('Ti arresto!');
+	},
+	doExportSired: function(e) {
+		alert('boooo');
+	}
+});
+
+window.ExportWidget = new ExportView({
+	
+});
\ No newline at end of file
diff --git a/webroot/js/views/guest.js b/webroot/js/views/guest.js
index 7f252668..7e91df30 100644
--- a/webroot/js/views/guest.js
+++ b/webroot/js/views/guest.js
@@ -11,6 +11,7 @@ window.EditGuestView = EditView.extend({
 	ITProvinces: [], //All italian provinces
 	MunicipalityOfBirthCollection: null, //instance of Municipality for birth
 	MunicipalityOfResidenceCollection: null, //instance of Municipality for residence
+	MunicipalityOfCitizenshipCollection: null, //instance of Municipality for citizenship
 	IdentificationTypeCollection: AllIdentificationTypes, //instance of IdentificationType
     events: {
         "submit form": "save",
@@ -21,50 +22,62 @@ window.EditGuestView = EditView.extend({
         "change #Formid_countryOfResidence":"selectedCountryOfResidence",
         "change #FormResidenceProvinceSelector":"selectedProvinceOfResidence",
         "change #FormResidencePlace":"updateFormResidencePlace",
+        "change #Formid_countryOfCitizenship":"selectedCountryOfCitizenship",
+        "change #FormIdentificationTypeProvinceSelector":"selectedProvinceOfIdentificationType",
+        "change #FormIdentificationTypePlace":"updateFormIdentificationTypePlace",
+        "change #IdentificationTypeSelector":'selectedIdentificationType'
     },
     initialize: function () {
     	var that = this;
         this.model.bind('change', this.render, this);
         this.id = null;
         this.ITProvinces = AllProvinces.toJSON();
-        this.availableCitizenships = [];
+        this.availableCountriesCitizenship = [];
         this.availableCountriesBirth = [];
         this.availableCountriesResidence = [];
-        this.initializeCitizenships();
+        this.initializeCountriesCitizenship();
         this.initializeCountriesBirth();
         this.initializeCountriesResidence();
         this.initializeIdentificationTypes();
         
-        //function to send guest id on parent
-		$(".btn_select_guest").click(function(event){
-			var id = 0;
-			try {
-				id = that.model.get("id");
-			} catch(e) {
-				console.log(e);
-			}
-			if (id > 0) {
-				//call correct callback
-				var cb = GetQueryStringParams('callback');
-				if (cb == 'setbooker') {
-					parent.window.SelectBookerWidget.select(that.model.toJSON());
-					parent.$.colorbox.close();
-				} else if (cb == 'setgroupleader') {
-					parent.window.SelectGroupLeaderWidget.select(that.model.toJSON());
-					parent.$.colorbox.close();
-				} else if (cb == 'setguests') {
-					parent.window.ListHousedWidget.select(that.model.toJSON());
-					parent.$.colorbox.close();
-				}
-			}
-		});
+        //if open for editing or select
+        var edit = GetQueryStringParams('editguest');
+        if (edit=='true') {
+        	$(".btn_add_form").hide();
+        	$(".btn_select_guest").hide();
+        } else {
+        	$(".btn_add_form").show();
+        	//function to send guest id on parent
+    		$(".btn_select_guest").show().click(function(event){
+    			var id = 0;
+    			try {
+    				id = that.model.get("id");
+    			} catch(e) {
+    				console.log(e);
+    			}
+    			if (id > 0) {
+    				//call correct callback
+    				var cb = GetQueryStringParams('callback');
+    				if (cb == 'setbooker') {
+    					parent.window.SelectBookerWidget.select(that.model.toJSON());
+    					parent.$.colorbox.close();
+    				} else if (cb == 'setgroupleader') {
+    					parent.window.SelectGroupLeaderWidget.select(that.model.toJSON());
+    					parent.$.colorbox.close();
+    				} else if (cb == 'setguests') {
+    					parent.window.ListHousedWidget.select(that.model.toJSON());
+    					parent.$.colorbox.close();
+    				}
+    			}
+    		});
+        }
         
     },
     /**
      * Initialize availableCitizenship property added to model  and only to be used in the template.
      */
-    initializeCitizenships: function () {
-    	this.availableCitizenships=AllCountries.toJSON();
+    initializeCountriesCitizenship: function () {
+    	this.availableCountriesCitizenship=AllCountries.toJSON();
     },
     /**
      * Initialize availableCountries property added to model  and only to be used in the template.
@@ -87,15 +100,15 @@ window.EditGuestView = EditView.extend({
     /**
      * Set the saved Citizenship in the list of available countries.
      */
-    setCitizenships: function (aCountryId) {
+    setCountriesCitizenship: function (aCountryId) {
     	aCountry = (aCountryId && aCountryId > 0) ? parseInt(aCountryId) : 0;
-    	_.each(this.availableCitizenships, function (val) {
+    	_.each(this.availableCountriesCitizenship, function (val) {
             val.selected = false;
             if (val.id == aCountry) {
                 val.selected = true;
             }
         });
-        return this.availableCitizenships;
+        return this.availableCountriesCitizenship;
     },
     /**
      * Set the saved country in the list of available countries.
@@ -136,6 +149,25 @@ window.EditGuestView = EditView.extend({
         });
         return this.availableIdentificationTypes;
     },
+    /*
+     * On select identification type
+     */
+    selectedIdentificationType: function(e) {
+    	var select = $(e.currentTarget);
+    	var current_id = select.val();
+    	
+    	//if identificationtype is not null
+    	if (current_id != '') {
+    		//if current citizenship Italy
+    		if ($('#Formid_countryOfCitizenship option:selected').val() == this.countryDefaultId) {
+    			$('#FormCitizenship').show();
+    		} else {
+    			$('#FormCitizenship').hide();
+    		}
+    	} else {
+    		$('#FormCitizenship').hide();
+    	}
+    },
     /**
      * On select country show a select for province.
      * Only if Italy.
@@ -311,6 +343,91 @@ window.EditGuestView = EditView.extend({
     	//reset fields
     	$('#FormAddress').get(0).value = '';
     },
+    /**
+     * On select country show a select for province.
+     * Only if Italy.
+     */
+    selectedCountryOfCitizenship: function(e) {
+    	var select = $(e.currentTarget);
+    	var current_id = parseInt(select.val());
+    	
+    	//reset fields.
+    	$.each($('#FormIdentificationTypeProvinceSelector option'),function(i,v){
+    		if (i==0) {
+    			$(v).attr("selected","selected");
+    		} else {
+    			$(v).attr("selected",false);
+    		}
+    	});
+    	try {
+    		//on init this field not exists!
+    		$('#id_idPlace').get(0).value='';
+    	} catch(e){};
+    	
+    	
+    	if (current_id==this.countryDefaultId) {
+    		$('#IdentificationTypeProvinceSelector').removeClass('none');
+    	} else {
+    		$('#IdentificationTypeProvinceSelector').addClass('none');
+    		$('#IdentificationTypePlaceSelector').addClass('none');
+    	}
+    },
+    /**
+     * On select province of Residence populate Municipality.
+     * Only if Italy.
+     */
+    selectedProvinceOfIdentificationType: function(e) {
+    	var that = this;
+    	//reset fields
+    	$('#id_idPlace').get(0).value='';
+    	$('#IdentificationTypePlaceSelector').addClass('none'); //container of placeselection
+    	var select = $(e.currentTarget);
+    	var current_province_code = select.val();
+    	if (current_province_code != "") {
+    		//get municipalities
+    		this.MunicipalityOfCitizenshipCollection = new Municipalities([],{
+    			provinceCode: current_province_code
+    		});
+    		this.MunicipalityOfCitizenshipCollection.reset();
+    		this.MunicipalityOfCitizenshipCollection.fetch({
+    			success: function() {
+    				that.populateFormIdentificationTypePlace();
+    			},
+    			error: function() {
+        			$.jGrowl($.i18n("seriousErrorDescr") + '', { header: this.alertOK,sticky: true });
+        		}
+    		});
+    	}
+    },
+    /**
+     * populate Residence Municipality set current selected by model.
+     * Only if Italy.
+     */
+    populateFormIdentificationTypePlace: function() {
+    	var that = this;
+    	var select = $('#FormIdentificationTypePlace');
+    	if (this.MunicipalityOfCitizenshipCollection) {
+    		select.html('');
+    		select.append('<option value="0">Scegli la città</option>');
+    		$.each(this.MunicipalityOfCitizenshipCollection.toJSON(), function(i,v){
+    			var selected = (that.model.get("id_idPlace")==v.id) ? 'selected="selected"':'';
+    			select.append('<option value="'+v.id+'" '+selected+'>'+v.description+'</option>');
+    		});
+    		$('#IdentificationTypePlaceSelector').removeClass('none')
+    	}
+    },
+    /**
+     * Update Hidden for Citizenship Municipality (Fake it's the id place for document).
+     * 
+     * Only if Italy.
+     */
+    updateFormIdentificationTypePlace: function(e) {
+    	var that = this;
+    	var select = $(e.currentTarget);
+    	var current_id = parseInt(select.val());
+    	var current_text = select.find("option:selected").text();
+    	$('#id_idPlace').get(0).value=current_id;
+    },
     /**
      * Initialize guest properties added to model and only to be used in the template.
      */
@@ -323,7 +440,7 @@ window.EditGuestView = EditView.extend({
         var modelToRender = this.model.toJSON();
         // set additional attribute to display Citizenship/countries/Provinces/identification types
         modelToRender.ITProvinces = this.ITProvinces;
-        modelToRender.availableCitizenships = this.setCitizenships(this.model.get("id_citizenship"));
+        modelToRender.availableCountriesCitizenship = this.setCountriesCitizenship(this.model.get("id_citizenship"));
         modelToRender.availableCountriesBirth = this.setCountriesBirth(this.model.get("id_countryOfBirth"));
         modelToRender.availableCountriesResidence = this.setCountriesResidence(this.model.get("id_countryOfResidence"));
         modelToRender.availableIdentificationTypes = this.setIdentificationTypes(this.model.get("id_idType"));
@@ -457,6 +574,42 @@ window.EditGuestView = EditView.extend({
         } else {
         	this.selectedCountryOfResidence({currentTarget:'#Formid_countryOfResidence'});
         }
+        if (that.model.get("id_idPlace")) {
+        	//AJAX CALL for get province of municipality
+        	$.ajax({
+        		url:'rest/municipalities/'+this.model.get("id_idPlace"),
+        		data:{},
+        		success:function(data) {
+        			var json = $.parseJSON(JSON.stringify(data, undefined, 2));
+        			
+        			//update province
+        			$.each($('#FormIdentificationTypeProvinceSelector option'), function(i,v) {
+                		if ($(v).attr("value")==json.province) {
+                			$(v).attr("selected","selected");
+                			$('#IdentificationTypeProvinceSelector').removeClass('none');
+                			//update municipality
+                    		that.MunicipalityOfCitizenshipCollection = new Municipalities([],{
+                    			provinceCode: json.province
+                    		});
+                    		that.MunicipalityOfCitizenshipCollection.reset();
+                    		that.MunicipalityOfCitizenshipCollection.fetch({
+                    			success: function() {
+                    				that.populateFormIdentificationTypePlace();
+                    			},
+                    			error: function() {
+                        			$.jGrowl($.i18n("seriousErrorDescr") + '', { header: this.alertOK,sticky: true });
+                        		}
+                    		});
+                			
+                		}
+                	});
+        			
+        			
+        		},
+        	}); 
+        } else {
+        	this.selectedCountryOfCitizenship({currentTarget:'#Formid_countryOfCitizenship'});
+        }
     },
     // save new item or update existing item.
     save: function (e) {
diff --git a/webroot/js/views/housed.js b/webroot/js/views/housed.js
index 30db30cf..d3230b69 100644
--- a/webroot/js/views/housed.js
+++ b/webroot/js/views/housed.js
@@ -11,6 +11,9 @@ window.SelectBookerView = RowView.extend({
 	id_booking: 0,
 	indexTemplate: "#selectbooker-template",
 	el: '#selectbooker-list',
+	events: {
+		'click .bookerdetails':'editBooker',
+	},
     initialize: function (options) {
     	this.modifing = options.modifing;
     	if (options.id_booking) { 
@@ -101,6 +104,28 @@ window.SelectBookerView = RowView.extend({
     	
     	//update frontend
     	this.render(model);
+    },
+    editBooker: function(e) {
+    	//open lightbox for editing a guest
+    	$.colorbox({
+    		iframe:true,
+    		width:980,
+    		height:560,
+    		href:'goUpdateGuestsFromPlanner.action?sect=guests&callback=setbooker&housed=false&editguest=true&id='+$('input:hidden[name="booking.booker.id"]').get(0).value,
+    		onOpen:function() {
+    			//$('.ui-dialog .ui-widget').hide();
+    			//$('.ui-widget-overlay').hide();
+    		},
+    		onCleanup: function() {
+    			//$('.ui-dialog .ui-widget').show();
+    			//$('.ui-widget-overlay').show();
+    			//$('.btn_save').hide();
+    			//$('.canc_booking').hide();
+    			
+    			//refresh this widget
+    			refresh_all_housedwidgets();
+    		}
+    	});
     }
 });
 
@@ -120,7 +145,9 @@ window.SelectGroupLeaderView = RowView.extend({
     	this.get();
     },
     events: {
-    	'click input:radio[name="groupType"]':'switchgroupType'
+    	'click input:radio[name="groupType"]':'switchgroupType',
+    	'click .groupleaderdetails':'editGroupLeader',
+    	'click .groupleader_clear':'del',
     },
     render: function (model, housedType) {
     	var that = this;
@@ -160,6 +187,7 @@ window.SelectGroupLeaderView = RowView.extend({
         		}
         	});
         });
+        
         return this;
     },
     switchgroupType: function(e) {
@@ -250,6 +278,45 @@ window.SelectGroupLeaderView = RowView.extend({
         		}
 	    	});
     	}
+    },
+    del: function(e) {
+    	//remove a group leader
+    	var that = this;
+    	$.ajax({
+    		type:'DELETE',
+    		url:'rest/groupLeader/'+that.current_groupLeader.id,
+    		contentType: "application/json",
+    		success:function(data) {
+    			//var json = $.parseJSON(JSON.stringify(data, undefined, 2));
+    			that.get();
+    		},
+    		error: function() {
+    			$.jGrowl($.i18n("seriousErrorDescr") + '', { header: this.alertOK,sticky: true });
+    		}
+    	});
+    },
+    editGroupLeader: function(e) {
+    	//open lightbox for editing a guest
+    	var that = this;
+    	$.colorbox({
+    		iframe:true,
+    		width:980,
+    		height:560,
+    		href:'goUpdateGuestsFromPlanner.action?sect=guests&callback=setgroupleader&housed=false&editguest=true&id='+that.current_groupLeader.housed.guest.id,
+    		onOpen:function() {
+    			//$('.ui-dialog .ui-widget').hide();
+    			//$('.ui-widget-overlay').hide();
+    		},
+    		onCleanup: function() {
+    			//$('.ui-dialog .ui-widget').show();
+    			//$('.ui-widget-overlay').show();
+    			//$('.btn_save').hide();
+    			//$('.canc_booking').hide();
+    			
+    			//refresh this widget
+    			refresh_all_housedwidgets();
+    		}
+    	});
     }
 });
 
@@ -270,6 +337,12 @@ window.ListHousedView = RowView.extend({
         "click span.row-item-destroy": "del",
         "click .housed_cleardate":"clearDate",
         "click .housed_selectdate":"showDateSelector",
+        'click .houseddetails':'editHoused',
+    },
+    refresh: function() {
+    	this.collection.fetch({
+        	url:'rest/housed/booking/'+this.id_booking
+        });
     },
     initialize: function (options) {
     	this.id_booking = options.id_booking;
@@ -502,5 +575,42 @@ window.ListHousedView = RowView.extend({
     			$.jGrowl($.i18n("seriousErrorDescr") + '', { header: this.alertOK,sticky: true });
     		}
     	});
+    },
+    editHoused: function(e) {
+    	//get from hidden the correct id of housed
+    	var hidden_id = $(e.currentTarget).parent().parent().find("input:hidden['name=guestid']");
+    	//open lightbox for editing current guest of Housed
+    	$.colorbox({
+    		iframe:true,
+    		width:980,
+    		height:560,
+    		href:'goUpdateGuestsFromPlanner.action?sect=guests&callback=setguests&housed=false&editguest=true&id='+hidden_id.val(),
+    		onOpen:function() {
+    			//$('.ui-dialog .ui-widget').hide();
+    			//$('.ui-widget-overlay').hide();
+    		},
+    		onCleanup: function() {
+    			//$('.ui-dialog .ui-widget').show();
+    			//$('.ui-widget-overlay').show();
+    			//$('.btn_save').hide();
+    			//$('.canc_booking').hide();
+    			
+    			//refresh this widget
+    			refresh_all_housedwidgets();
+    		}
+    	});
     }
-});
\ No newline at end of file
+});
+
+function refresh_all_housedwidgets() {
+	//special global function for refresh all instances of widgets
+	try {
+		window.SelectBookerWidget.get();
+	} catch(e){};
+	try {
+		window.SelectGroupLeaderWidget.get();
+	} catch(e){};
+	try {
+		window.ListHousedWidget.refresh();
+	} catch(e){};
+}
\ No newline at end of file
