From: Roland Haeder <roland@mxchange.org>
Date: Sun, 17 Apr 2016 14:48:08 +0000 (+0200)
Subject: Moved generic templates/page files to sub folders for re-organization.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=53c581f2e328d14516c9600d82b723bfb0f91d1f;p=addressbook-war.git

Moved generic templates/page files to sub folders for re-organization.

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index 52787ffd..4b11ea61 100644
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -2,6 +2,7 @@
 <Scene Scope="Project" version="2">
     <Scope Scope="Faces Configuration Only"/>
     <Scope Scope="Project">
+<<<<<<< HEAD
         <Node id="admin/admin_user_delete.xhtml" x="1150" y="900" zoom="true"/>
         <Node id="privacy.xhtml" x="400" y="600" zoom="true"/>
         <Node id="login/login_change_password.xhtml" x="1150" y="750" zoom="true"/>
@@ -54,6 +55,50 @@
         <Node id="admin/admin_product_delete.xhtml" x="400" y="1200" zoom="true"/>
         <Node id="login/login_change_email_address.xhtml" x="900" y="600" zoom="true"/>
         <Node id="admin/admin_contact_cellphone_unlink.xhtml" x="1400" y="150" zoom="true"/>
+=======
+        <Node id="admin/cellphone/admin_contact_cellphone_list.xhtml" x="1400" y="300" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_delete.xhtml" x="650" y="600" zoom="true"/>
+        <Node id="customer/checkout2.xhtml" x="150" y="750" zoom="true"/>
+        <Node id="admin/contact/admin_contact_show.xhtml" x="1900" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_list.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="privacy.xhtml" x="900" y="750" zoom="true"/>
+        <Node id="customer/checkout.xhtml" x="1400" y="150" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_show.xhtml" x="150" y="1200" zoom="true"/>
+        <Node id="admin/user/admin_user_show.xhtml" x="400" y="900" zoom="true"/>
+        <Node id="admin/product/admin_product_delete.xhtml" x="1150" y="300" zoom="true"/>
+        <Node id="admin/index.xhtml" x="1900" y="300" zoom="true"/>
+        <Node id="basket.xhtml" x="150" y="900" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_delete.xhtml" x="900" y="300" zoom="true"/>
+        <Node id="exception.xhtml" x="650" y="900" zoom="true"/>
+        <Node id="admin/user/admin_user_delete.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="customer/register.xhtml" x="1150" y="150" zoom="true"/>
+        <Node id="admin/category/admin_category_list.xhtml" x="400" y="1200" zoom="true"/>
+        <Node id="item_added.xhtml" x="1400" y="450" zoom="true"/>
+        <Node id="admin/category/admin_category_delete.xhtml" x="150" y="1350" zoom="true"/>
+        <Node id="admin/contact/admin_country_delete.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="admin/user/admin_user_edit.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="admin/admin_logout.xhtml" x="900" y="600" zoom="true"/>
+        <Node id="terms.xhtml" x="1400" y="600" zoom="true"/>
+        <Node id="admin/user/admin_user_unlock.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="admin/contact/admin_country_edit.xhtml" x="1650" y="300" zoom="true"/>
+        <Node id="admin/user/admin_user_list.xhtml" x="400" y="1050" zoom="true"/>
+        <Node id="customer/lost_passwd.xhtml" x="1150" y="600" zoom="true"/>
+        <Node id="index.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/category/admin_category_edit.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="logout.xhtml" x="1150" y="750" zoom="true"/>
+        <Node id="admin/contact/admin_country_list.xhtml" x="900" y="900" zoom="true"/>
+        <Node id="customer/checkout_done.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="*" x="400" y="600" zoom="true"/>
+        <Node id="imprint.xhtml" x="650" y="750" zoom="true"/>
+        <Node id="customer/login.xhtml" x="900" y="450" zoom="true"/>
+        <Node id="admin/mobile_provider/admin_mobile_provider_edit.xhtml" x="1650" y="450" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_edit.xhtml" x="1650" y="150" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_show.xhtml" x="650" y="1050" zoom="true"/>
+        <Node id="admin/product/admin_product_edit.xhtml" x="400" y="750" zoom="true"/>
+        <Node id="admin/cellphone/admin_contact_cellphone_unlink.xhtml" x="150" y="1050" zoom="true"/>
+        <Node id="admin/product/admin_product_list.xhtml" x="2400" y="150" zoom="true"/>
+        <Node id="customer/empty_basket.xhtml" x="2150" y="150" zoom="true"/>
+>>>>>>> 3d514fb... Moved generic templates/page files to sub folders for re-organization.
     </Scope>
     <Scope Scope="All Faces Configurations"/>
 </Scene>
diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 11b8c85e..efc46f02 100644
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -91,6 +91,10 @@
 			<from-outcome>login_own_addressbooks</from-outcome>
 			<to-view-id>/login/login_own_addressbooks.xhtml</to-view-id>
 		</navigation-case>
+		<navigation-case>
+			<from-outcome>admin_logout</from-outcome>
+			<to-view-id>/admin/admin_logout.xhtml</to-view-id>
+		</navigation-case>
 		<navigation-case>
 			<from-outcome>basket</from-outcome>
 			<to-view-id>/basket.xhtml</to-view-id>
@@ -101,19 +105,19 @@
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_user</from-outcome>
-			<to-view-id>/admin/admin_user_list.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_countries</from-outcome>
-			<to-view-id>/admin/admin_country_list.xhtml</to-view-id>
+			<to-view-id>/admin/contact/admin_country_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_list.xhtml</to-view-id>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_list_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_list.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_list.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
@@ -218,121 +222,121 @@
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_country_list.xhtml</from-view-id>
+		<from-view-id>/admin/contact/admin_country_list.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_edit_country</from-outcome>
-			<to-view-id>/admin/admin_country_edit.xhtml</to-view-id>
+			<to-view-id>/admin/contact/admin_country_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_country</from-outcome>
-			<to-view-id>/admin/admin_country_delete.xhtml</to-view-id>
+			<to-view-id>/admin/contact/admin_country_delete.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_mobile_provider_list.xhtml</from-view-id>
+		<from-view-id>/admin/mobile_provider/admin_mobile_provider_list.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_edit_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_edit.xhtml</to-view-id>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_delete.xhtml</to-view-id>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_delete.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_show.xhtml</to-view-id>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_user_list.xhtml</from-view-id>
+		<from-view-id>/admin/user/admin_user_list.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_show_user</from-outcome>
-			<to-view-id>/admin/admin_user_show.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_show.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_edit_user</from-outcome>
-			<to-view-id>/admin/admin_user_edit.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_user</from-outcome>
-			<to-view-id>/admin/admin_user_delete.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_delete.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlock_user</from-outcome>
-			<to-view-id>/admin/admin_user_unlock.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_unlock.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_user_show.xhtml</from-view-id>
+		<from-view-id>/admin/user/admin_user_show.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_show_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_show.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_show.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_edit_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_edit.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlink_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_unlink.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_delete.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_edit_user</from-outcome>
-			<to-view-id>/admin/admin_user_edit.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_user</from-outcome>
-			<to-view-id>/admin/admin_user_delete.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_delete.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlock_user</from-outcome>
-			<to-view-id>/admin/admin_user_unlock.xhtml</to-view-id>
+			<to-view-id>/admin/user/admin_user_unlock.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_show.xhtml</to-view-id>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_contact_cellphone_list.xhtml</from-view-id>
+		<from-view-id>/admin/cellphone/admin_contact_cellphone_list.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_show_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_show.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_show.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_edit_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_edit.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_delete.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<navigation-rule>
-		<from-view-id>/admin/admin_contact_cellphone_show.xhtml</from-view-id>
+		<from-view-id>/admin/cellphone/admin_contact_cellphone_show.xhtml</from-view-id>
 		<navigation-case>
 			<from-outcome>admin_show_mobile_provider</from-outcome>
-			<to-view-id>/admin/admin_mobile_provider_show.xhtml</to-view-id>
+			<to-view-id>/admin/mobile_provider/admin_mobile_provider_show.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_edit_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_edit.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_edit.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_delete_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_delete.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_delete.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_unlink_contact_cellphone</from-outcome>
-			<to-view-id>/admin/admin_contact_cellphone_unlink.xhtml</to-view-id>
+			<to-view-id>/admin/cellphone/admin_contact_cellphone_unlink.xhtml</to-view-id>
 		</navigation-case>
 		<navigation-case>
 			<from-outcome>admin_show_contact</from-outcome>
-			<to-view-id>/admin/admin_contact_show.xhtml</to-view-id>
+			<to-view-id>/admin/contact/admin_contact_show.xhtml</to-view-id>
 		</navigation-case>
 	</navigation-rule>
 	<!--
diff --git a/web/WEB-INF/templates/admin/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/admin_cellphone_data.tpl
deleted file mode 100644
index 030d3528..00000000
--- a/web/WEB-INF/templates/admin/admin_cellphone_data.tpl
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
-
-	<h:outputText styleClass="errors" value="#{ERROR_PARAMETER_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty cellphoneNumber}" />
-
-	<h:panelGrid id="cellphone_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CELLPHONE_DATA}" headerClass="table_header_column" styleClass="table_big" columns="2" rendered="#{not empty cellphoneNumber}">
-		<f:facet name="header">
-			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_CELLPHONE_DATA}" />
-		</f:facet>
-
-		<h:column>
-			<h:outputLabel for="cellphoneId" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_ID}" />
-
-			<h:outputText id="cellphoneId" styleClass="data_field" value="#{cellphoneNumber.phoneId}" />
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="cellphoneProvider" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_PROVIDER_NAME}" />
-
-			<h:link outcome="admin_show_mobile_provider">
-				<f:param name="providerId" value="#{cellphoneNumber.cellphoneProvider.providerId}" />
-				<h:outputText id="cellphoneProvider" styleClass="data_field" value="#{cellphoneNumber.cellphoneProvider.providerName}" />
-			</h:link>
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="cellphoneNumber" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_NUMBER_COMPLETE}" />
-
-			<h:outputText id="cellphoneNumber" styleClass="data_field" value="#{cellphoneNumber.cellphoneProvider.providerCountry.countryExternalDialPrefix}#{cellphoneNumber.cellphoneProvider.providerDialPrefix}-#{cellphoneNumber.phoneNumber}" />
-		</h:column>
-
-		<h:column>
-			<h:outputLabel for="cellphoneLinks" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_LINKS}" />
-
-			<div id="cellphoneLinks" class="data_field">
-				<ui:include src="/WEB-INF/templates/admin/admin_cellphone_links.tpl">
-					<ui:param name="cellphoneNumber" value="#{cellphoneNumber}" />
-					<ui:param name="contact" value="#{user.userContact}" />
-					<ui:param name="isShowPage" value="#{isShowPage}" />
-				</ui:include>
-			</div>
-		</h:column>
-	</h:panelGrid>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/admin_cellphone_links.tpl b/web/WEB-INF/templates/admin/admin_cellphone_links.tpl
deleted file mode 100644
index f3201442..00000000
--- a/web/WEB-INF/templates/admin/admin_cellphone_links.tpl
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
-
-	<h:outputText styleClass="errors" value="#{ERROR_PARAMETER_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty cellphoneNumber}" />
-
-	<ui:fragment rendered="#{not empty cellphoneNumber}">
-		<ul class="mini_nav">
-			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
-				<li class="mini_link">
-					<h:link outcome="admin_show_contact_cellphone">
-						<h:outputText value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}" />
-						<f:param name="phoneId" value="#{cellphoneNumber.phoneId}" />
-					</h:link>
-				</li>
-			</ui:fragment>
-
-			<li class="mini_link">
-				<h:link outcome="admin_edit_contact_cellphone">
-					<h:outputText value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}" />
-					<f:param name="phoneId" value="#{cellphoneNumber.phoneId}" />
-				</h:link>
-			</li>
-
-			<ui:fragment rendered="#{not empty contact}">
-				<li class="mini_link">
-					<h:link outcome="admin_unlink_contact_cellphone">
-						<h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-						<f:param name="phoneId" value="#{cellphoneNumber.phoneId}" />
-						<f:param name="contactId" value="#{contact.contactId}" />
-					</h:link>
-				</li>
-			</ui:fragment>
-
-			<li class="mini_link">
-				<h:link outcome="admin_delete_contact_cellphone">
-					<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
-					<f:param name="phoneId" value="#{cellphoneNumber.phoneId}" />
-				</h:link>
-			</li>
-		</ul>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/admin_form_country_data.tpl
deleted file mode 100644
index 47299fdc..00000000
--- a/web/WEB-INF/templates/admin/admin_form_country_data.tpl
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
-
-	<div class="para notice">
-		#{msg.ADMIN_COUNTRY_DATA_MINIMUM_NOTICE}
-	</div>
-
-	<div class="para">
-		<fieldset id="country_data">
-			<legend title="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND_TITLE}">#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND}</legend>
-
-			<div class="table_row">
-				<div class="table_left_medium">
-					<h:outputLabel for="countryAbroadDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_ABROAD_DIAL_PREFIX}" />
-				</div>
-
-				<div class="table_right_medium">
-					<h:inputText class="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true">
-						<f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
-					</h:inputText>
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left_medium">
-					<h:outputLabel for="countryCode" value="#{msg.ADMIN_ENTER_COUNTRY_CODE}" />
-				</div>
-
-				<div class="table_right_medium">
-					<h:inputText class="input" id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
-						<f:validateRegex for="countryCode" pattern="[A-Z]{2}" />
-					</h:inputText>
-
-					<h:outputText class="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_CODE_EXAMPLE}" />
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left_medium">
-					<h:outputLabel for="countryI18nKey" value="#{msg.ADMIN_ENTER_COUNTRY_I18N_KEY}" />
-				</div>
-
-				<div class="table_right_medium">
-					<h:inputText class="input" id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
-						<f:validateRegex for="countryI18nKey" pattern="[A-Z_]{2,}" />
-					</h:inputText>
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left_medium">
-					<h:outputLabel for="countryIsLocalPrefixRequired" value="#{msg.ADMIN_SELECT_COUNTRY_IS_EXTERNAL_DIAL_PREFIX_REQUIORED}" />
-				</div>
-
-				<div class="table_right_medium">
-					<h:selectOneListbox required="true" id="countryIsLocalPrefixRequired" value="#{adminCountryController.countryIsLocalPrefixRequired}" size="1" class="select">
-						<f:selectItem itemValue="true" itemLabel="#{msg.YES}" />
-						<f:selectItem itemValue="false" itemLabel="#{msg.NO}" />
-					</h:selectOneListbox>
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left_medium">
-					<h:outputLabel for="countryExternalDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
-				</div>
-
-				<div class="table_right_medium">
-					<h:inputText class="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true">
-						<f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
-					</h:inputText>
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left_medium">
-					<h:outputLabel for="countryPhoneCode" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE}" />
-				</div>
-
-				<div class="table_right_medium">
-					<h:inputText class="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true">
-						<f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
-					</h:inputText>
-
-					<h:outputText class="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE}" />
-				</div>
-
-				<div class="clear"></div>
-			</div>
-		</fieldset>
-	</div>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/admin_form_mobile_provider.tpl
deleted file mode 100644
index 25f954eb..00000000
--- a/web/WEB-INF/templates/admin/admin_form_mobile_provider.tpl
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
-
-	<div class="para notice">
-		#{msg.ADMIN_MOBILE_PROVIDER_MINIMUM_NOTICE}
-	</div>
-
-	<div class="para">
-		<fieldset id="mobile_provider">
-			<legend title="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND_TITLE}">#{msg.ADMIN_MOBILE_PROVIDER_LEGEND}</legend>
-
-			<div class="table_row">
-				<div class="table_left_medium">
-					<h:outputLabel for="providerDialPrefix" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_DIAL_PREFIX}" />
-				</div>
-
-				<div class="table_right_medium">
-					<h:inputText class="input" id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
-						<f:validateLongRange for="providerDialPrefix" minimum="0" maximum="9999" />
-					</h:inputText>
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left_medium">
-					<h:outputLabel for="providerMailRegex" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN}" />
-				</div>
-
-				<div class="table_right_medium">
-					<h:inputText class="input" id="providerMailRegex" size="10" maxlength="30" value="#{adminMobileProviderController.providerMailPattern}" required="true" />
-
-					<h:outputText class="small notice" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE}" />
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left_medium">
-					<h:outputLabel for="providerName" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_NAME}" />
-				</div>
-
-				<div class="table_right_medium">
-					<h:inputText class="input" id="providerName" size="20" maxlength="100" value="#{adminMobileProviderController.providerName}" required="true" />
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left_medium">
-					<h:outputLabel for="providerCountry" value="#{msg.ADMIN_SELECT_MOBILE_PROVIDER_COUNTRY}" />
-				</div>
-
-				<div class="table_right_medium">
-					<h:selectOneMenu class="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}" converter="country">
-						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
-					</h:selectOneMenu>
-				</div>
-
-				<div class="clear"></div>
-			</div>
-		</fieldset>
-	</div>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/admin_form_personal_data.tpl b/web/WEB-INF/templates/admin/admin_form_personal_data.tpl
deleted file mode 100644
index 87d709e3..00000000
--- a/web/WEB-INF/templates/admin/admin_form_personal_data.tpl
+++ /dev/null
@@ -1,251 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
-
-	<div class="para notice">
-		#{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE}
-	</div>
-
-	<div class="para">
-		<fieldset id="personal_data">
-			<legend title="#{msg.ADMIN_PERSONAL_DATA_LEGEND_TITLE}">#{msg.ADMIN_PERSONAL_DATA_LEGEND}</legend>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="gender" value="#{msg.ADMIN_PERSONAL_DATA_GENDER}" />
-				</div>
-
-				<div class="table_right">
-					<ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
-						<ui:param name="targetController" value="#{adminUserController}" />
-					</ui:include>
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
-				</div>
-
-				<div class="table_right">
-					<h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{adminUserController.firstName}" required="true">
-						<f:validator for="firstName" validatorId="NameValidator" />
-					</h:inputText>
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
-				</div>
-
-				<div class="table_right">
-					<h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{adminUserController.familyName}" required="true">
-						<f:validator for="familyName" validatorId="NameValidator" />
-					</h:inputText>
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="street" value="#{msg.ADMIN_PERSONAL_DATA_STREET}" />
-				</div>
-
-				<div class="table_right">
-					<h:inputText class="input" id="street" size="20" maxlength="255" value="#{adminUserController.street}" />
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="houseNumber" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER}" />
-				</div>
-
-				<div class="table_right">
-					<h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{adminUserController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
-						<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
-					</h:inputText>
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="zipCode" value="#{msg.ADMIN_PERSONAL_DATA_ZIP_CODE}" />
-				</div>
-
-				<div class="table_right">
-					<h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{adminUserController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
-						<f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
-					</h:inputText>
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="city" value="#{msg.ADMIN_PERSONAL_DATA_CITY}" />
-				</div>
-
-				<div class="table_right">
-					<h:inputText class="input" id="city" size="10" maxlength="255" value="#{adminUserController.city}" />
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="country" value="#{msg.ADMIN_PERSONAL_DATA_COUNTRY_CODE}" />
-				</div>
-
-				<div class="table_right">
-					<h:selectOneMenu class="select" id="country" value="#{adminUserController.country}" converter="country">
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
-					</h:selectOneMenu>
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
-				</div>
-
-				<div class="table_right">
-					<h:selectOneMenu class="select" id="countryPhoneCode" value="#{adminUserController.phoneCountry}" converter="country">
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
-					</h:selectOneMenu>
-
-					<h:inputText class="input" id="phoneAreaCode" size="5" maxlength="10" value="#{adminUserController.phoneAreaCode}">
-						<f:validator for="phoneAreaCode" validatorId="PhoneNumberValidator" />
-					</h:inputText>
-
-					<h:inputText class="input" id="phoneNumber" size="10" maxlength="20" value="#{adminUserController.phoneNumber}">
-						<f:validator for="phoneNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="faxNumber" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
-				</div>
-
-				<div class="table_right">
-					<h:selectOneMenu class="select" id="faxCountryCode" value="#{adminUserController.faxCountry}" converter="country">
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
-						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
-					</h:selectOneMenu>
-
-					<h:inputText class="input" id="faxAreaCode" size="5" maxlength="10" value="#{adminUserController.faxAreaCode}">
-						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
-					</h:inputText>
-
-					<h:inputText class="input" id="faxNumber" size="10" maxlength="20" value="#{adminUserController.faxNumber}">
-						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
-					</h:inputText>
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="cellphoneNumber" value="#{msg.ADMIN_PERSONAL_DATA_CELLPHONE_NUMBER}" />
-				</div>
-
-				<div class="table_right">
-					<ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
-						<ui:param name="targetController" value="#{adminUserController}" />
-					</ui:include>
-				</div>
-
-				<div class="clear"></div>
-			</div>
-		</fieldset>
-	</div>
-
-	<div class="para">
-		<fieldset id="login_data">
-			<legend title="#{msg.ADMIN_ADD_USER_EMAIL_LEGEND_TITLE}">#{msg.ADMIN_ADD_USER_EMAIL_LEGEND}</legend>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="userName" value="#{msg.ADMIN_ADD_USER_ENTER_USER_NAME}" />
-				</div>
-
-				<div class="table_right">
-					<h:inputText class="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="emailAddress" value="#{msg.ADMIN_ADD_USER_ENTER_EMAIL}" />
-				</div>
-
-				<div class="table_right">
-					<h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{adminUserController.emailAddress}" required="true" />
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="para"></div>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="password1" value="#{msg.ADMIN_ADD_USER_ENTER_PASSWORD1}" />
-				</div>
-
-				<div class="table_right">
-					<h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" required="true" />
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="table_row">
-				<div class="table_left">
-					<h:outputLabel for="password2" value="#{msg.ADMIN_ADD_USER_ENTER_PASSWORD2}" />
-				</div>
-
-				<div class="table_right">
-					<h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" required="true" />
-				</div>
-
-				<div class="clear"></div>
-			</div>
-
-			<div class="para notice">
-				<ul>
-					<li>#{msg.ADMIN_ADD_USER_USER_NAME_NOTICE}</li>
-					<li>#{msg.ADMIN_ADD_USER_PASSWORD_NOTICE}</li>
-					<li>#{msg.ADMIN_ADD_USER_EMAIL_ADDRESS_NOTICE}</li>
-					<li>#{msg.ADMIN_ADD_USER_CUSTOMER_NUMBER_NOTICE}</li>
-				</ul>
-			</div>
-		</fieldset>
-	</div>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/admin_user_links.tpl b/web/WEB-INF/templates/admin/admin_user_links.tpl
deleted file mode 100644
index 86529553..00000000
--- a/web/WEB-INF/templates/admin/admin_user_links.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:f="http://java.sun.com/jsf/core"
-	xmlns:h="http://java.sun.com/jsf/html"
-	xmlns:ui="http://java.sun.com/jsf/facelets">
-
-	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_USER_NOT_SET}" rendered="#{empty user}" />
-
-	<ui:fragment rendered="#{not empty user}">
-		<div class="table">
-			<div class="table_header">
-				<h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
-			</div>
-
-			<div class="table_row">
-				<ul>
-					<li>
-						<h:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_USER}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
-							<f:param name="userId" value="#{user.userId}" />
-						</h:link>
-					</li>
-
-					<li>
-						<h:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_USER}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}">
-							<f:param name="userId" value="#{user.userId}" />
-						</h:link>
-					</li>
-
-					<li>
-						<h:link outcome="admin_delete_user" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}">
-							<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_USER}" />
-							<f:param name="userId" value="#{user.userId}" />
-						</h:link>
-					</li>
-				</ul>
-			</div>
-		</div>
-	</ui:fragment>
-</ui:composition>
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
new file mode 100644
index 00000000..f1aedf31
--- /dev/null
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://java.sun.com/jsf/facelets">
+
+	<h:outputText styleClass="errors" value="#{ERROR_PARAMETER_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty cellphoneNumber}" />
+
+	<h:panelGrid id="cellphone_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CELLPHONE_DATA}" headerClass="table_header_column" styleClass="table_big" columns="2" rendered="#{not empty cellphoneNumber}">
+		<f:facet name="header">
+			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_CELLPHONE_DATA}" />
+		</f:facet>
+
+		<h:column>
+			<h:outputLabel for="cellphoneId" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_ID}" />
+
+			<h:outputText id="cellphoneId" styleClass="data_field" value="#{cellphoneNumber.phoneId}" />
+		</h:column>
+
+		<h:column>
+			<h:outputLabel for="cellphoneProvider" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_PROVIDER_NAME}" />
+
+			<h:link outcome="admin_show_mobile_provider">
+				<f:param name="providerId" value="#{cellphoneNumber.cellphoneProvider.providerId}" />
+				<h:outputText id="cellphoneProvider" styleClass="data_field" value="#{cellphoneNumber.cellphoneProvider.providerName}" />
+			</h:link>
+		</h:column>
+
+		<h:column>
+			<h:outputLabel for="cellphoneNumber" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_NUMBER_COMPLETE}" />
+
+			<h:outputText id="cellphoneNumber" styleClass="data_field" value="#{cellphoneNumber.cellphoneProvider.providerCountry.countryExternalDialPrefix}#{cellphoneNumber.cellphoneProvider.providerDialPrefix}-#{cellphoneNumber.phoneNumber}" />
+		</h:column>
+
+		<h:column>
+			<h:outputLabel for="cellphoneLinks" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_LINKS}" />
+
+			<div id="cellphoneLinks" class="data_field">
+				<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl">
+					<ui:param name="cellphoneNumber" value="#{cellphoneNumber}" />
+					<ui:param name="contact" value="#{user.userContact}" />
+					<ui:param name="isShowPage" value="#{isShowPage}" />
+				</ui:include>
+			</div>
+		</h:column>
+	</h:panelGrid>
+</ui:composition>
diff --git a/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl
new file mode 100644
index 00000000..f3201442
--- /dev/null
+++ b/web/WEB-INF/templates/admin/cellphone/admin_cellphone_links.tpl
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://java.sun.com/jsf/facelets">
+
+	<h:outputText styleClass="errors" value="#{ERROR_PARAMETER_CELLPHONE_NUMBER_NOT_SET}" rendered="#{empty cellphoneNumber}" />
+
+	<ui:fragment rendered="#{not empty cellphoneNumber}">
+		<ul class="mini_nav">
+			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
+				<li class="mini_link">
+					<h:link outcome="admin_show_contact_cellphone">
+						<h:outputText value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}" />
+						<f:param name="phoneId" value="#{cellphoneNumber.phoneId}" />
+					</h:link>
+				</li>
+			</ui:fragment>
+
+			<li class="mini_link">
+				<h:link outcome="admin_edit_contact_cellphone">
+					<h:outputText value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}" />
+					<f:param name="phoneId" value="#{cellphoneNumber.phoneId}" />
+				</h:link>
+			</li>
+
+			<ui:fragment rendered="#{not empty contact}">
+				<li class="mini_link">
+					<h:link outcome="admin_unlink_contact_cellphone">
+						<h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+						<f:param name="phoneId" value="#{cellphoneNumber.phoneId}" />
+						<f:param name="contactId" value="#{contact.contactId}" />
+					</h:link>
+				</li>
+			</ui:fragment>
+
+			<li class="mini_link">
+				<h:link outcome="admin_delete_contact_cellphone">
+					<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+					<f:param name="phoneId" value="#{cellphoneNumber.phoneId}" />
+				</h:link>
+			</li>
+		</ul>
+	</ui:fragment>
+</ui:composition>
diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
new file mode 100644
index 00000000..47299fdc
--- /dev/null
+++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://java.sun.com/jsf/facelets">
+
+	<div class="para notice">
+		#{msg.ADMIN_COUNTRY_DATA_MINIMUM_NOTICE}
+	</div>
+
+	<div class="para">
+		<fieldset id="country_data">
+			<legend title="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND_TITLE}">#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND}</legend>
+
+			<div class="table_row">
+				<div class="table_left_medium">
+					<h:outputLabel for="countryAbroadDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_ABROAD_DIAL_PREFIX}" />
+				</div>
+
+				<div class="table_right_medium">
+					<h:inputText class="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true">
+						<f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left_medium">
+					<h:outputLabel for="countryCode" value="#{msg.ADMIN_ENTER_COUNTRY_CODE}" />
+				</div>
+
+				<div class="table_right_medium">
+					<h:inputText class="input" id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
+						<f:validateRegex for="countryCode" pattern="[A-Z]{2}" />
+					</h:inputText>
+
+					<h:outputText class="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_CODE_EXAMPLE}" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left_medium">
+					<h:outputLabel for="countryI18nKey" value="#{msg.ADMIN_ENTER_COUNTRY_I18N_KEY}" />
+				</div>
+
+				<div class="table_right_medium">
+					<h:inputText class="input" id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
+						<f:validateRegex for="countryI18nKey" pattern="[A-Z_]{2,}" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left_medium">
+					<h:outputLabel for="countryIsLocalPrefixRequired" value="#{msg.ADMIN_SELECT_COUNTRY_IS_EXTERNAL_DIAL_PREFIX_REQUIORED}" />
+				</div>
+
+				<div class="table_right_medium">
+					<h:selectOneListbox required="true" id="countryIsLocalPrefixRequired" value="#{adminCountryController.countryIsLocalPrefixRequired}" size="1" class="select">
+						<f:selectItem itemValue="true" itemLabel="#{msg.YES}" />
+						<f:selectItem itemValue="false" itemLabel="#{msg.NO}" />
+					</h:selectOneListbox>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left_medium">
+					<h:outputLabel for="countryExternalDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
+				</div>
+
+				<div class="table_right_medium">
+					<h:inputText class="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true">
+						<f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left_medium">
+					<h:outputLabel for="countryPhoneCode" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE}" />
+				</div>
+
+				<div class="table_right_medium">
+					<h:inputText class="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true">
+						<f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
+					</h:inputText>
+
+					<h:outputText class="small notice" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE_EXAMPLE}" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
+		</fieldset>
+	</div>
+</ui:composition>
diff --git a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
new file mode 100644
index 00000000..25f954eb
--- /dev/null
+++ b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://java.sun.com/jsf/facelets">
+
+	<div class="para notice">
+		#{msg.ADMIN_MOBILE_PROVIDER_MINIMUM_NOTICE}
+	</div>
+
+	<div class="para">
+		<fieldset id="mobile_provider">
+			<legend title="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND_TITLE}">#{msg.ADMIN_MOBILE_PROVIDER_LEGEND}</legend>
+
+			<div class="table_row">
+				<div class="table_left_medium">
+					<h:outputLabel for="providerDialPrefix" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_DIAL_PREFIX}" />
+				</div>
+
+				<div class="table_right_medium">
+					<h:inputText class="input" id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
+						<f:validateLongRange for="providerDialPrefix" minimum="0" maximum="9999" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left_medium">
+					<h:outputLabel for="providerMailRegex" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN}" />
+				</div>
+
+				<div class="table_right_medium">
+					<h:inputText class="input" id="providerMailRegex" size="10" maxlength="30" value="#{adminMobileProviderController.providerMailPattern}" required="true" />
+
+					<h:outputText class="small notice" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE}" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left_medium">
+					<h:outputLabel for="providerName" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_NAME}" />
+				</div>
+
+				<div class="table_right_medium">
+					<h:inputText class="input" id="providerName" size="20" maxlength="100" value="#{adminMobileProviderController.providerName}" required="true" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left_medium">
+					<h:outputLabel for="providerCountry" value="#{msg.ADMIN_SELECT_MOBILE_PROVIDER_COUNTRY}" />
+				</div>
+
+				<div class="table_right_medium">
+					<h:selectOneMenu class="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}" converter="country">
+						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
+					</h:selectOneMenu>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+		</fieldset>
+	</div>
+</ui:composition>
diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
new file mode 100644
index 00000000..87d709e3
--- /dev/null
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://java.sun.com/jsf/facelets">
+
+	<div class="para notice">
+		#{msg.ADMIN_PERSONAL_DATA_MINIMUM_NOTICE}
+	</div>
+
+	<div class="para">
+		<fieldset id="personal_data">
+			<legend title="#{msg.ADMIN_PERSONAL_DATA_LEGEND_TITLE}">#{msg.ADMIN_PERSONAL_DATA_LEGEND}</legend>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="gender" value="#{msg.ADMIN_PERSONAL_DATA_GENDER}" />
+				</div>
+
+				<div class="table_right">
+					<ui:include src="/WEB-INF/templates/generic/gender_selection_box.tpl">
+						<ui:param name="targetController" value="#{adminUserController}" />
+					</ui:include>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputText class="input" id="firstName" size="10" maxlength="255" value="#{adminUserController.firstName}" required="true">
+						<f:validator for="firstName" validatorId="NameValidator" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputText class="input" id="familyName" size="10" maxlength="255" value="#{adminUserController.familyName}" required="true">
+						<f:validator for="familyName" validatorId="NameValidator" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="street" value="#{msg.ADMIN_PERSONAL_DATA_STREET}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputText class="input" id="street" size="20" maxlength="255" value="#{adminUserController.street}" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="houseNumber" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputText class="input" id="houseNumber" size="3" maxlength="5" value="#{adminUserController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
+						<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="zipCode" value="#{msg.ADMIN_PERSONAL_DATA_ZIP_CODE}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputText class="input" id="zipCode" size="5" maxlength="6" value="#{adminUserController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
+						<f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="city" value="#{msg.ADMIN_PERSONAL_DATA_CITY}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputText class="input" id="city" size="10" maxlength="255" value="#{adminUserController.city}" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="country" value="#{msg.ADMIN_PERSONAL_DATA_COUNTRY_CODE}" />
+				</div>
+
+				<div class="table_right">
+					<h:selectOneMenu class="select" id="country" value="#{adminUserController.country}" converter="country">
+						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryCode} (#{msg[c.countryI18nkey]})" />
+					</h:selectOneMenu>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
+				</div>
+
+				<div class="table_right">
+					<h:selectOneMenu class="select" id="countryPhoneCode" value="#{adminUserController.phoneCountry}" converter="country">
+						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+					</h:selectOneMenu>
+
+					<h:inputText class="input" id="phoneAreaCode" size="5" maxlength="10" value="#{adminUserController.phoneAreaCode}">
+						<f:validator for="phoneAreaCode" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+
+					<h:inputText class="input" id="phoneNumber" size="10" maxlength="20" value="#{adminUserController.phoneNumber}">
+						<f:validator for="phoneNumber" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="faxNumber" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
+				</div>
+
+				<div class="table_right">
+					<h:selectOneMenu class="select" id="faxCountryCode" value="#{adminUserController.faxCountry}" converter="country">
+						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItems value="#{countryController.allCountries()}" var="c" itemValue="#{c}" itemLabel="#{c.countryAbroadDialPrefix}#{c.countryPhoneCode}" />
+					</h:selectOneMenu>
+
+					<h:inputText class="input" id="faxAreaCode" size="5" maxlength="10" value="#{adminUserController.faxAreaCode}">
+						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+
+					<h:inputText class="input" id="faxNumber" size="10" maxlength="20" value="#{adminUserController.faxNumber}">
+						<f:validator for="faxNumber" validatorId="PhoneNumberValidator" />
+					</h:inputText>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="cellphoneNumber" value="#{msg.ADMIN_PERSONAL_DATA_CELLPHONE_NUMBER}" />
+				</div>
+
+				<div class="table_right">
+					<ui:include src="/WEB-INF/templates/generic/mobile_selection_box.tpl">
+						<ui:param name="targetController" value="#{adminUserController}" />
+					</ui:include>
+				</div>
+
+				<div class="clear"></div>
+			</div>
+		</fieldset>
+	</div>
+
+	<div class="para">
+		<fieldset id="login_data">
+			<legend title="#{msg.ADMIN_ADD_USER_EMAIL_LEGEND_TITLE}">#{msg.ADMIN_ADD_USER_EMAIL_LEGEND}</legend>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="userName" value="#{msg.ADMIN_ADD_USER_ENTER_USER_NAME}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputText class="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="emailAddress" value="#{msg.ADMIN_ADD_USER_ENTER_EMAIL}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{adminUserController.emailAddress}" required="true" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="para"></div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="password1" value="#{msg.ADMIN_ADD_USER_ENTER_PASSWORD1}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputSecret class="input" id="password1" size="10" maxlength="255" value="#{adminUserController.userPassword}" required="true" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="table_row">
+				<div class="table_left">
+					<h:outputLabel for="password2" value="#{msg.ADMIN_ADD_USER_ENTER_PASSWORD2}" />
+				</div>
+
+				<div class="table_right">
+					<h:inputSecret class="input" id="password2" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" required="true" />
+				</div>
+
+				<div class="clear"></div>
+			</div>
+
+			<div class="para notice">
+				<ul>
+					<li>#{msg.ADMIN_ADD_USER_USER_NAME_NOTICE}</li>
+					<li>#{msg.ADMIN_ADD_USER_PASSWORD_NOTICE}</li>
+					<li>#{msg.ADMIN_ADD_USER_EMAIL_ADDRESS_NOTICE}</li>
+					<li>#{msg.ADMIN_ADD_USER_CUSTOMER_NUMBER_NOTICE}</li>
+				</ul>
+			</div>
+		</fieldset>
+	</div>
+</ui:composition>
diff --git a/web/WEB-INF/templates/admin/user/admin_user_links.tpl b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
new file mode 100644
index 00000000..86529553
--- /dev/null
+++ b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://java.sun.com/jsf/core"
+	xmlns:h="http://java.sun.com/jsf/html"
+	xmlns:ui="http://java.sun.com/jsf/facelets">
+
+	<h:outputText styleClass="errors" value="#{msg.ERROR_PARAMETER_USER_NOT_SET}" rendered="#{empty user}" />
+
+	<ui:fragment rendered="#{not empty user}">
+		<div class="table">
+			<div class="table_header">
+				<h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
+			</div>
+
+			<div class="table_row">
+				<ul>
+					<li>
+						<h:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_USER}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
+							<f:param name="userId" value="#{user.userId}" />
+						</h:link>
+					</li>
+
+					<li>
+						<h:link outcome="admin_unlock_user" value="#{msg.ADMIN_LINK_UNLOCK_USER}" title="#{msg.ADMIN_LINK_UNLOCK_USER_TITLE}">
+							<f:param name="userId" value="#{user.userId}" />
+						</h:link>
+					</li>
+
+					<li>
+						<h:link outcome="admin_delete_user" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}">
+							<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_USER}" />
+							<f:param name="userId" value="#{user.userId}" />
+						</h:link>
+					</li>
+				</ul>
+			</div>
+		</div>
+	</ui:fragment>
+</ui:composition>
diff --git a/web/admin/admin_contact_cellphone_delete.xhtml b/web/admin/admin_contact_cellphone_delete.xhtml
deleted file mode 100644
index 6811bab4..00000000
--- a/web/admin/admin_contact_cellphone_delete.xhtml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<f:metadata>
-		<f:viewParam name="phoneId" value="#{adminMobileProviderController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-	</f:metadata>
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_CELLPHONE}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT_CELLPHONE}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_contact_cellphone_edit.xhtml b/web/admin/admin_contact_cellphone_edit.xhtml
deleted file mode 100644
index eb3f1d96..00000000
--- a/web/admin/admin_contact_cellphone_edit.xhtml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<f:metadata>
-		<f:viewParam name="phoneId" value="#{adminMobileProviderController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-	</f:metadata>
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_CELLPHONE}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EDIT_CONTACT_CELLPHONE}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_contact_cellphone_list.xhtml b/web/admin/admin_contact_cellphone_list.xhtml
deleted file mode 100644
index 2a27f578..00000000
--- a/web/admin/admin_contact_cellphone_list.xhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_contact_cellphone_show.xhtml b/web/admin/admin_contact_cellphone_show.xhtml
deleted file mode 100644
index 5997f1a7..00000000
--- a/web/admin/admin_contact_cellphone_show.xhtml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<f:metadata>
-		<f:viewParam name="phoneId" value="#{adminContactPhoneController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-	</f:metadata>
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT_CELLPHONE}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT_CELLPHONE}
-		</ui:define>
-
-		<ui:define name="content">
-			<ui:include src="/WEB-INF/templates/admin/admin_cellphone_data.tpl">
-				<ui:param name="cellphoneNumber" value="#{adminContactPhoneController.cellPhone}" />
-				<ui:param name="isShowPage" value="#{true}" />
-			</ui:include>
-
-			<h:dataTable id="contact_cellphone_link" var="contact" value="#{adminContactPhoneController.allCellphoneContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_CONTACT_CELLPHONE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
-				<f:facet name="header">
-					<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT_CELLPHONE_LINKS}">
-						<f:param value="#{adminContactPhoneController.cellPhone.phoneId}" />
-					</h:outputFormat>
-				</f:facet>
-
-				<h:column>
-					<h:outputLabel for="contactId" styleClass="data_label" value="#{msg.ADMIN_SHOW_CONTACT_ID}" />
-
-					<h:link id="contactId" styleClass="data_field" outcome="admin_show_contact">
-						<h:outputText value="#{contact.contactId}" />
-						<f:param name="contactId" value="#{contact.contactId}" />
-					</h:link>
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_GENDER}" />
-
-					<h:outputText id="contactGender" styleClass="data_field" value="#{msg[contact.contactGender.messageKey]}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_TITLE}" />
-
-					<h:outputText id="contactTitle" styleClass="data_field" value="#{contact.contactTitle}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FIRST_NAME}" />
-
-					<h:outputText id="contactFirstName" styleClass="data_field" value="#{contact.contactFirstName}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FAMILY_NAME}" />
-
-					<h:outputText id="contactFamilyName" styleClass="data_field" value="#{contact.contactFamilyName}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_EMAIL_ADDRESS}" />
-
-					<h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{contact.contactEmailAddress}">
-						<h:outputText value="#{contact.contactEmailAddress}" />
-					</h:outputLink>
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="cellphoneLinks" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_UNLINK}" />
-
-					<div id="cellphoneLinks" class="data_field">
-						<ul class="mini_nav">
-							<li class="mini_link">
-								<h:link outcome="admin_unlink_contact_cellphone">
-									<h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
-									<f:param name="phoneId" value="#{adminContactPhoneController.cellPhone.phoneId}" />
-									<f:param name="contactId" value="#{contact.contactId}" />
-								</h:link>
-							</li>
-						</ul>
-					</div>
-				</h:column>
-			</h:dataTable>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_contact_cellphone_unlink.xhtml b/web/admin/admin_contact_cellphone_unlink.xhtml
deleted file mode 100644
index 6f7500d8..00000000
--- a/web/admin/admin_contact_cellphone_unlink.xhtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<f:metadata>
-		<f:viewParam name="phoneId" value="#{adminContactPhoneController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
-		<f:viewParam name="contactId" value="#{adminContactPhoneController.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
-	</f:metadata>
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_contact_show.xhtml b/web/admin/admin_contact_show.xhtml
deleted file mode 100644
index 173c2d4a..00000000
--- a/web/admin/admin_contact_show.xhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_country_delete.xhtml b/web/admin/admin_country_delete.xhtml
deleted file mode 100644
index 70c22343..00000000
--- a/web/admin/admin_country_delete.xhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_COUNTRY}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_DELETE_COUNTRY}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_country_edit.xhtml b/web/admin/admin_country_edit.xhtml
deleted file mode 100644
index 00157901..00000000
--- a/web/admin/admin_country_edit.xhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_COUNTRY}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EDIT_COUNTRY}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_country_list.xhtml b/web/admin/admin_country_list.xhtml
deleted file mode 100644
index c051c3dc..00000000
--- a/web/admin/admin_country_list.xhtml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:dataTable id="table_list_countries" var="country" value="#{adminCountryController.allCountries()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{adminCountryController.hasCountries()}">
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID}</f:facet>
-
-					<h:link outcome="admin_edit_country" title="#{msg.ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE}" value="#{country.countryId}">
-						<f:param name="countryId" value="#{country.countryId}" />
-					</h:link>
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE}</f:facet>
-
-					<h:outputText value="#{country.countryCode}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}</f:facet>
-
-					<h:outputText value="#{country.countryExternalDialPrefix}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}</f:facet>
-
-					<h:outputText value="#{msg[country.countryI18nkey]}" />
-				</h:column>
-			</h:dataTable>
-
-			<h:form id="add_country">
-				<div class="table_medium">
-					<div class="table_header">
-						#{msg.ADMIN_ADD_COUNTRY_TITLE}
-					</div>
-
-					<ui:include src="/WEB-INF/templates/admin/admin_form_country_data.tpl" />
-
-					<div class="table_footer">
-						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
-					</div>
-				</div>
-
-				<div class="para notice">
-					#{msg.ADMIN_ADD_COUNTRY_NOTICES}
-					<ul>
-						<li>#{msg.ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE}</li>
-					</ul>
-				</div>
-			</h:form>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_mobile_provider_delete.xhtml b/web/admin/admin_mobile_provider_delete.xhtml
deleted file mode 100644
index 25ac615e..00000000
--- a/web/admin/admin_mobile_provider_delete.xhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_mobile_provider_edit.xhtml b/web/admin/admin_mobile_provider_edit.xhtml
deleted file mode 100644
index f7c36586..00000000
--- a/web/admin/admin_mobile_provider_edit.xhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_mobile_provider_list.xhtml b/web/admin/admin_mobile_provider_list.xhtml
deleted file mode 100644
index c9222ce2..00000000
--- a/web/admin/admin_mobile_provider_list.xhtml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:dataTable id="table_list_mobile" var="mobile" value="#{adminMobileProviderController.allMobileProvider()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{adminMobileProviderController.hasMobileProvider()}">
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_ID}</f:facet>
-
-					<h:link outcome="admin_edit_mobile_provider" title="#{msg.ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE}" value="#{mobile.providerId}">
-						<f:param name="providerId" value="#{mobile.providerId}" />
-					</h:link>
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}</f:facet>
-
-					<h:outputText value="#{mobile.providerName}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}</f:facet>
-
-					<h:outputText value="#{mobile.providerDialPrefix}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}</f:facet>
-
-					<h:outputText value="#{msg[mobile.providerCountry.countryI18nkey]}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED}</f:facet>
-
-					<h:outputText id="providerEntryCreated" value="#{mobile.providerEntryCreated.time}" title="#{msg.ADMIN_MOBILE_PROVIDER_ENTRY_CREATED_TITLE}">
-						<f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
-					</h:outputText>
-				</h:column>
-			</h:dataTable>
-
-			<h:form id="add_provider">
-				<div class="table_medium">
-					<div class="table_header">
-						#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}
-					</div>
-
-					<ui:include src="/WEB-INF/templates/admin/admin_form_mobile_provider.tpl" />
-
-					<div class="table_footer">
-						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
-					</div>
-				</div>
-
-				<div class="para notice">
-					#{msg.ADMIN_ADD_MOBILE_PROVIDER_NOTICES}
-					<ul>
-						<li>#{msg.ADMIN_ADD_MOBILE_PROVIDER_PATTERN}</li>
-					</ul>
-				</div>
-			</h:form>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_mobile_provider_show.xhtml b/web/admin/admin_mobile_provider_show.xhtml
deleted file mode 100644
index 5689de21..00000000
--- a/web/admin/admin_mobile_provider_show.xhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_user_delete.xhtml b/web/admin/admin_user_delete.xhtml
deleted file mode 100644
index 23b4d5d9..00000000
--- a/web/admin/admin_user_delete.xhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_USER}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_DELETE_USER}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_user_edit.xhtml b/web/admin/admin_user_edit.xhtml
deleted file mode 100644
index 1d77e150..00000000
--- a/web/admin/admin_user_edit.xhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_USER}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_EDIT_USER}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_user_list.xhtml b/web/admin/admin_user_list.xhtml
deleted file mode 100644
index 01cb96dd..00000000
--- a/web/admin/admin_user_list.xhtml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_USER}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_LIST_USER}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:dataTable id="table_list_users" var="user" value="#{adminUserController.allUsers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{adminUserController.hasUsers()}">
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_USER_ID}</f:facet>
-
-					<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
-						<f:param name="userId" value="#{user.userId}" />
-					</h:link>
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_USER_NAME}</f:facet>
-
-					<h:outputText value="#{user.userName}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_USER_GENDER}</f:facet>
-
-					<h:outputText value="#{msg[user.userContact.contactGender.messageKey]}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_USER_FIRST_NAME}</f:facet>
-
-					<h:outputText value="#{user.userContact.contactFirstName}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_USER_FAMILY_NAME}</f:facet>
-
-					<h:outputText value="#{user.userContact.contactFamilyName}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_USER_ACCOUNT_STATUS}</f:facet>
-
-					<h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_USER_PROFILE_MODE}</f:facet>
-
-					<h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
-				</h:column>
-
-				<h:column>
-					<f:facet name="header">#{msg.ADMIN_LIST_USER_CREATED}</f:facet>
-
-					<h:outputText id="userCreated" value="#{user.userCreated.time}">
-						<f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
-					</h:outputText>
-				</h:column>
-			</h:dataTable>
-
-			<div class="table">
-				<h:form id="admin_add_user">
-					<div class="table_header">
-						#{msg.ADMIN_ADD_USER_TITLE}
-					</div>
-
-					<ui:include src="/WEB-INF/templates/admin/admin_form_personal_data.tpl" />
-
-					<div class="table_footer">
-						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-						<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
-					</div>
-				</h:form>
-			</div>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_user_show.xhtml b/web/admin/admin_user_show.xhtml
deleted file mode 100644
index dff90801..00000000
--- a/web/admin/admin_user_show.xhtml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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://xmlns.jcp.org/jsf/facelets"
-	  xmlns:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<f:metadata>
-		<f:viewParam name="userId" value="#{userController.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
-	</f:metadata>
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_USER}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_SHOW_USER}
-		</ui:define>
-
-		<ui:define name="content">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty userController.user}" />
-
-			<h:panelGrid id="user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty userController.user}">
-				<f:facet name="header">
-					<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
-						<f:param value="#{userController.user.userName}" />
-						<f:param value="#{userController.user.userId}" />
-					</h:outputFormat>
-				</f:facet>
-
-				<h:column>
-					<h:outputLabel for="userId" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ID}" />
-
-					<h:outputText id="userId" styleClass="data_field" value="#{userController.user.userId}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_NAME}" />
-
-					<h:outputText id="userName" styleClass="data_field" value="#{userController.user.userName}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="userCreated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CREATED}" />
-
-					<h:outputText id="userCreated" styleClass="data_field" value="#{userController.user.userCreated.time}">
-						<f:convertDateTime for="userCreated" type="both" />
-					</h:outputText>
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="userUpdated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_UPDATED}" />
-
-					<h:outputText id="userUpdated" styleClass="data_field" value="#{userController.user.userUpdated.time}">
-						<f:convertDateTime for="userUpdated" type="both" />
-					</h:outputText>
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="userAccountStatus" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ACCOUNT_STATUS}" />
-
-					<h:outputText id="userAccountStatus" styleClass="data_field #{userController.user.userAccountStatus.styleClass}" value="#{msg[userController.user.userAccountStatus.messageKey]}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="userProfileMode" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_PROFILE_MODE}" />
-
-					<h:outputText id="userProfileMode" styleClass="data_field" value="#{msg[userController.user.userProfileMode.messageKey]}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="userLastLocked" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_LAST_LOCKED}" />
-
-					<h:outputText id="userLastLocked" styleClass="data_field" value="#{userController.user.userLastLocked.time}">
-						<f:convertDateTime for="userLastLocked" type="both" />
-					</h:outputText>
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="lastLockedReason" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_LAST_LOCKED_REASON}" />
-
-					<h:outputText id="lastLockedReason" styleClass="data_field" value="#{userController.user.lastLockedReason}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CONTACT_CREATED}" />
-
-					<h:outputText id="contactCreated" styleClass="data_field" value="#{userController.user.userContact.contactCreated.time}">
-						<f:convertDateTime for="contactCreated" type="both" />
-					</h:outputText>
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CONTACT_UPDATED}" />
-
-					<h:outputText id="contactUpdated" styleClass="data_field" value="#{userController.user.userContact.contactUpdated.time}">
-						<f:convertDateTime for="contactUpdated" type="both" />
-					</h:outputText>
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_IS_OWN_CONTACT}" />
-
-					<h:outputText id="isOwnContact" styleClass="data_field" value="#{userController.user.userContact.isOwnContact()}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_GENDER}" />
-
-					<h:outputText id="contactGender" styleClass="data_field" value="#{msg[userController.user.userContact.contactGender.messageKey]}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_TITLE}" />
-
-					<h:outputText id="contactTitle" styleClass="data_field" value="#{userController.user.userContact.contactTitle}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FIRST_NAME}" />
-
-					<h:outputText id="contactFirstName" styleClass="data_field" value="#{userController.user.userContact.contactFirstName}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FAMILY_NAME}" />
-
-					<h:outputText id="contactFamilyName" styleClass="data_field" value="#{userController.user.userContact.contactFamilyName}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_STREET}" />
-
-					<h:outputText id="contactStreet" styleClass="data_field" value="#{userController.user.userContact.contactStreet}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_HOUSE_NUMBER}" />
-
-					<h:outputText id="contactHouseNumber" styleClass="data_field" value="#{userController.user.userContact.contactHouseNumber}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ZIP_CODE}" />
-
-					<h:outputText id="contactZipCode" styleClass="data_field" value="#{userController.user.userContact.contactZipCode}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CITY}" />
-
-					<h:outputText id="contactCity" styleClass="data_field" value="#{userController.user.userContact.contactCity}" />
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_EMAIL_ADDRESS}" />
-
-					<h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{userController.user.userContact.contactEmailAddress}">
-						<h:outputText value="#{userController.user.userContact.contactEmailAddress}" />
-					</h:outputLink>
-				</h:column>
-
-				<h:column>
-					<h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_BIRTHDAY}" />
-
-					<h:outputText id="contactBirthday" styleClass="data_field" value="#{userController.user.userContact.contactBirthday.time}">
-						<f:convertDateTime for="contactBirthday" type="date" />
-					</h:outputText>
-				</h:column>
-			</h:panelGrid>
-
-			<ui:include src="/WEB-INF/templates/admin/admin_user_links.tpl">
-				<ui:param name="user" value="#{userController.user}" />
-			</ui:include>
-
-			<ui:include src="/WEB-INF/templates/admin/admin_cellphone_data.tpl">
-				<ui:param name="cellphoneNumber" value="#{userController.user.userContact.contactCellphoneNumber}" />
-				<ui:param name="user" value="#{userController.user}" />
-			</ui:include>
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/admin_user_unlock.xhtml b/web/admin/admin_user_unlock.xhtml
deleted file mode 100644
index 68da193c..00000000
--- a/web/admin/admin_user_unlock.xhtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!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:h="http://xmlns.jcp.org/jsf/html"
-	  xmlns:f="http://xmlns.jcp.org/jsf/core"
-	  >
-
-	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}</ui:define>
-
-		<ui:define name="content_header">
-			#{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER}
-		</ui:define>
-
-		<ui:define name="content">
-			Here goes your content.
-		</ui:define>
-	</ui:composition>
-</html>
diff --git a/web/admin/cellphone/admin_contact_cellphone_delete.xhtml b/web/admin/cellphone/admin_contact_cellphone_delete.xhtml
new file mode 100644
index 00000000..6811bab4
--- /dev/null
+++ b/web/admin/cellphone/admin_contact_cellphone_delete.xhtml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{adminMobileProviderController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+	</f:metadata>
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_CELLPHONE}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_DELETE_CONTACT_CELLPHONE}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/cellphone/admin_contact_cellphone_edit.xhtml b/web/admin/cellphone/admin_contact_cellphone_edit.xhtml
new file mode 100644
index 00000000..eb3f1d96
--- /dev/null
+++ b/web/admin/cellphone/admin_contact_cellphone_edit.xhtml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{adminMobileProviderController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+	</f:metadata>
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_CELLPHONE}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_EDIT_CONTACT_CELLPHONE}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/cellphone/admin_contact_cellphone_list.xhtml b/web/admin/cellphone/admin_contact_cellphone_list.xhtml
new file mode 100644
index 00000000..2a27f578
--- /dev/null
+++ b/web/admin/cellphone/admin_contact_cellphone_list.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_CONTACT_CELLPHONE}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_LIST_CONTACT_CELLPHONE}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/cellphone/admin_contact_cellphone_show.xhtml b/web/admin/cellphone/admin_contact_cellphone_show.xhtml
new file mode 100644
index 00000000..fc8483a8
--- /dev/null
+++ b/web/admin/cellphone/admin_contact_cellphone_show.xhtml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{adminContactPhoneController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+	</f:metadata>
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT_CELLPHONE}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT_CELLPHONE}
+		</ui:define>
+
+		<ui:define name="content">
+			<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl">
+				<ui:param name="cellphoneNumber" value="#{adminContactPhoneController.cellPhone}" />
+				<ui:param name="isShowPage" value="#{true}" />
+			</ui:include>
+
+			<h:dataTable id="contact_cellphone_link" var="contact" value="#{adminContactPhoneController.allCellphoneContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_CONTACT_CELLPHONE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+				<f:facet name="header">
+					<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT_CELLPHONE_LINKS}">
+						<f:param value="#{adminContactPhoneController.cellPhone.phoneId}" />
+					</h:outputFormat>
+				</f:facet>
+
+				<h:column>
+					<h:outputLabel for="contactId" styleClass="data_label" value="#{msg.ADMIN_SHOW_CONTACT_ID}" />
+
+					<h:link id="contactId" styleClass="data_field" outcome="admin_show_contact">
+						<h:outputText value="#{contact.contactId}" />
+						<f:param name="contactId" value="#{contact.contactId}" />
+					</h:link>
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_GENDER}" />
+
+					<h:outputText id="contactGender" styleClass="data_field" value="#{msg[contact.contactGender.messageKey]}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_TITLE}" />
+
+					<h:outputText id="contactTitle" styleClass="data_field" value="#{contact.contactTitle}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FIRST_NAME}" />
+
+					<h:outputText id="contactFirstName" styleClass="data_field" value="#{contact.contactFirstName}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FAMILY_NAME}" />
+
+					<h:outputText id="contactFamilyName" styleClass="data_field" value="#{contact.contactFamilyName}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_EMAIL_ADDRESS}" />
+
+					<h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{contact.contactEmailAddress}">
+						<h:outputText value="#{contact.contactEmailAddress}" />
+					</h:outputLink>
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="cellphoneLinks" styleClass="data_label" value="#{msg.ADMIN_SHOW_CELLPHONE_UNLINK}" />
+
+					<div id="cellphoneLinks" class="data_field">
+						<ul class="mini_nav">
+							<li class="mini_link">
+								<h:link outcome="admin_unlink_contact_cellphone">
+									<h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+									<f:param name="phoneId" value="#{adminContactPhoneController.cellPhone.phoneId}" />
+									<f:param name="contactId" value="#{contact.contactId}" />
+								</h:link>
+							</li>
+						</ul>
+					</div>
+				</h:column>
+			</h:dataTable>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml b/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml
new file mode 100644
index 00000000..6f7500d8
--- /dev/null
+++ b/web/admin/cellphone/admin_contact_cellphone_unlink.xhtml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<f:metadata>
+		<f:viewParam name="phoneId" value="#{adminContactPhoneController.cellPhone}" converter="CellphoneConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_PHONE_ID_NOT_SET}" />
+		<f:viewParam name="contactId" value="#{adminContactPhoneController.contact}" converter="ContactConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_CONTACT_ID_NOT_SET}" />
+	</f:metadata>
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_UNLINK_CONTACT_CELLPHONE}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
new file mode 100644
index 00000000..173c2d4a
--- /dev/null
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_CONTACT}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_SHOW_CONTACT}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/country/admin_country_delete.xhtml b/web/admin/country/admin_country_delete.xhtml
new file mode 100644
index 00000000..70c22343
--- /dev/null
+++ b/web/admin/country/admin_country_delete.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_COUNTRY}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_DELETE_COUNTRY}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/country/admin_country_edit.xhtml b/web/admin/country/admin_country_edit.xhtml
new file mode 100644
index 00000000..00157901
--- /dev/null
+++ b/web/admin/country/admin_country_edit.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_COUNTRY}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_EDIT_COUNTRY}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
new file mode 100644
index 00000000..87a8347b
--- /dev/null
+++ b/web/admin/country/admin_country_list.xhtml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_COUNTRY}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_LIST_COUNTRY}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:dataTable id="table_list_countries" var="country" value="#{adminCountryController.allCountries()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{adminCountryController.hasCountries()}">
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID}</f:facet>
+
+					<h:link outcome="admin_edit_country" title="#{msg.ADMIN_LINK_EDIT_DELETE_COUNTRY_TITLE}" value="#{country.countryId}">
+						<f:param name="countryId" value="#{country.countryId}" />
+					</h:link>
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_CODE}</f:facet>
+
+					<h:outputText value="#{country.countryCode}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_EXTERNAL_DIAL_PREFIX}</f:facet>
+
+					<h:outputText value="#{country.countryExternalDialPrefix}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_NAME}</f:facet>
+
+					<h:outputText value="#{msg[country.countryI18nkey]}" />
+				</h:column>
+			</h:dataTable>
+
+			<h:form id="add_country">
+				<div class="table_medium">
+					<div class="table_header">
+						#{msg.ADMIN_ADD_COUNTRY_TITLE}
+					</div>
+
+					<ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
+
+					<div class="table_footer">
+						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+						<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
+					</div>
+				</div>
+
+				<div class="para notice">
+					#{msg.ADMIN_ADD_COUNTRY_NOTICES}
+					<ul>
+						<li>#{msg.ADMIN_ADD_COUNTRY_I18N_KEY_NOTICE}</li>
+					</ul>
+				</div>
+			</h:form>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
new file mode 100644
index 00000000..25ac615e
--- /dev/null
+++ b/web/admin/mobile_provider/admin_mobile_provider_delete.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_DELETE}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
new file mode 100644
index 00000000..f7c36586
--- /dev/null
+++ b/web/admin/mobile_provider/admin_mobile_provider_edit.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_EDIT}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
new file mode 100644
index 00000000..61d50717
--- /dev/null
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_MOBILE_PROVIDER_LIST}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_MOBILE_PROVIDER_LIST}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:dataTable id="table_list_mobile" var="mobile" value="#{adminMobileProviderController.allMobileProvider()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{adminMobileProviderController.hasMobileProvider()}">
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_ID}</f:facet>
+
+					<h:link outcome="admin_edit_mobile_provider" title="#{msg.ADMIN_LINK_EDIT_DELETE_MOBILE_PROVIDER_TITLE}" value="#{mobile.providerId}">
+						<f:param name="providerId" value="#{mobile.providerId}" />
+					</h:link>
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_NAME}</f:facet>
+
+					<h:outputText value="#{mobile.providerName}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_DIAL_PREFIX}</f:facet>
+
+					<h:outputText value="#{mobile.providerDialPrefix}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_COUNTRY}</f:facet>
+
+					<h:outputText value="#{msg[mobile.providerCountry.countryI18nkey]}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_MOBILE_PROVIDER_ENTRY_CREATED}</f:facet>
+
+					<h:outputText id="providerEntryCreated" value="#{mobile.providerEntryCreated.time}" title="#{msg.ADMIN_MOBILE_PROVIDER_ENTRY_CREATED_TITLE}">
+						<f:convertDateTime for="providerEntryCreated" type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</h:column>
+			</h:dataTable>
+
+			<h:form id="add_provider">
+				<div class="table_medium">
+					<div class="table_header">
+						#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}
+					</div>
+
+					<ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
+
+					<div class="table_footer">
+						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+						<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
+					</div>
+				</div>
+
+				<div class="para notice">
+					#{msg.ADMIN_ADD_MOBILE_PROVIDER_NOTICES}
+					<ul>
+						<li>#{msg.ADMIN_ADD_MOBILE_PROVIDER_PATTERN}</li>
+					</ul>
+				</div>
+			</h:form>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/mobile_provider/admin_mobile_provider_show.xhtml b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
new file mode 100644
index 00000000..5689de21
--- /dev/null
+++ b/web/admin/mobile_provider/admin_mobile_provider_show.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_SHOW_MOBILE_PROVIDER}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
new file mode 100644
index 00000000..23b4d5d9
--- /dev/null
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_DELETE_USER}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_DELETE_USER}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
new file mode 100644
index 00000000..1d77e150
--- /dev/null
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_EDIT_USER}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_EDIT_USER}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
new file mode 100644
index 00000000..61f18a82
--- /dev/null
+++ b/web/admin/user/admin_user_list.xhtml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LIST_USER}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_LIST_USER}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:dataTable id="table_list_users" var="user" value="#{adminUserController.allUsers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{adminUserController.hasUsers()}">
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_USER_ID}</f:facet>
+
+					<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{user.userId}">
+						<f:param name="userId" value="#{user.userId}" />
+					</h:link>
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_USER_NAME}</f:facet>
+
+					<h:outputText value="#{user.userName}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_USER_GENDER}</f:facet>
+
+					<h:outputText value="#{msg[user.userContact.contactGender.messageKey]}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_USER_FIRST_NAME}</f:facet>
+
+					<h:outputText value="#{user.userContact.contactFirstName}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_USER_FAMILY_NAME}</f:facet>
+
+					<h:outputText value="#{user.userContact.contactFamilyName}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_USER_ACCOUNT_STATUS}</f:facet>
+
+					<h:outputText styleClass="#{user.userAccountStatus.styleClass}" value="#{msg[user.userAccountStatus.messageKey]}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_USER_PROFILE_MODE}</f:facet>
+
+					<h:outputText value="#{msg[user.userProfileMode.messageKey]}" />
+				</h:column>
+
+				<h:column>
+					<f:facet name="header">#{msg.ADMIN_LIST_USER_CREATED}</f:facet>
+
+					<h:outputText id="userCreated" value="#{user.userCreated.time}">
+						<f:convertDateTime for="userCreated" type="both" timeStyle="short" dateStyle="short" />
+					</h:outputText>
+				</h:column>
+			</h:dataTable>
+
+			<div class="table">
+				<h:form id="admin_add_user">
+					<div class="table_header">
+						#{msg.ADMIN_ADD_USER_TITLE}
+					</div>
+
+					<ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
+
+					<div class="table_footer">
+						<h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+						<h:commandButton class="submit" type="submit" id="register" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
+					</div>
+				</h:form>
+			</div>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
new file mode 100644
index 00000000..7856af2f
--- /dev/null
+++ b/web/admin/user/admin_user_show.xhtml
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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://xmlns.jcp.org/jsf/facelets"
+	  xmlns:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<f:metadata>
+		<f:viewParam name="userId" value="#{userController.user}" converter="UserConverter" required="true" requiredMessage="#{msg.ERROR_PARAMETER_USER_ID_NOT_SET}" />
+	</f:metadata>
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_SHOW_USER}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_SHOW_USER}
+		</ui:define>
+
+		<ui:define name="content">
+			<h:outputText styleClass="errors" value="#{msg.ERROR_USER_ID_NOT_FOUND}" rendered="#{empty userController.user}" />
+
+			<h:panelGrid id="user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER}" headerClass="table_header_column" styleClass="table_big" columns="3" rendered="#{not empty userController.user}">
+				<f:facet name="header">
+					<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
+						<f:param value="#{userController.user.userName}" />
+						<f:param value="#{userController.user.userId}" />
+					</h:outputFormat>
+				</f:facet>
+
+				<h:column>
+					<h:outputLabel for="userId" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ID}" />
+
+					<h:outputText id="userId" styleClass="data_field" value="#{userController.user.userId}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="userName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_NAME}" />
+
+					<h:outputText id="userName" styleClass="data_field" value="#{userController.user.userName}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="userCreated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CREATED}" />
+
+					<h:outputText id="userCreated" styleClass="data_field" value="#{userController.user.userCreated.time}">
+						<f:convertDateTime for="userCreated" type="both" />
+					</h:outputText>
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="userUpdated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_UPDATED}" />
+
+					<h:outputText id="userUpdated" styleClass="data_field" value="#{userController.user.userUpdated.time}">
+						<f:convertDateTime for="userUpdated" type="both" />
+					</h:outputText>
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="userAccountStatus" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ACCOUNT_STATUS}" />
+
+					<h:outputText id="userAccountStatus" styleClass="data_field #{userController.user.userAccountStatus.styleClass}" value="#{msg[userController.user.userAccountStatus.messageKey]}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="userProfileMode" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_PROFILE_MODE}" />
+
+					<h:outputText id="userProfileMode" styleClass="data_field" value="#{msg[userController.user.userProfileMode.messageKey]}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="userLastLocked" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_LAST_LOCKED}" />
+
+					<h:outputText id="userLastLocked" styleClass="data_field" value="#{userController.user.userLastLocked.time}">
+						<f:convertDateTime for="userLastLocked" type="both" />
+					</h:outputText>
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="lastLockedReason" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_LAST_LOCKED_REASON}" />
+
+					<h:outputText id="lastLockedReason" styleClass="data_field" value="#{userController.user.lastLockedReason}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactCreated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CONTACT_CREATED}" />
+
+					<h:outputText id="contactCreated" styleClass="data_field" value="#{userController.user.userContact.contactCreated.time}">
+						<f:convertDateTime for="contactCreated" type="both" />
+					</h:outputText>
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactUpdated" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CONTACT_UPDATED}" />
+
+					<h:outputText id="contactUpdated" styleClass="data_field" value="#{userController.user.userContact.contactUpdated.time}">
+						<f:convertDateTime for="contactUpdated" type="both" />
+					</h:outputText>
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="isOwnContact" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_IS_OWN_CONTACT}" />
+
+					<h:outputText id="isOwnContact" styleClass="data_field" value="#{userController.user.userContact.isOwnContact()}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactGender" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_GENDER}" />
+
+					<h:outputText id="contactGender" styleClass="data_field" value="#{msg[userController.user.userContact.contactGender.messageKey]}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactTitle" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_TITLE}" />
+
+					<h:outputText id="contactTitle" styleClass="data_field" value="#{userController.user.userContact.contactTitle}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactFirstName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FIRST_NAME}" />
+
+					<h:outputText id="contactFirstName" styleClass="data_field" value="#{userController.user.userContact.contactFirstName}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactFamilyName" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_FAMILY_NAME}" />
+
+					<h:outputText id="contactFamilyName" styleClass="data_field" value="#{userController.user.userContact.contactFamilyName}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactStreet" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_STREET}" />
+
+					<h:outputText id="contactStreet" styleClass="data_field" value="#{userController.user.userContact.contactStreet}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactHouseNumber" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_HOUSE_NUMBER}" />
+
+					<h:outputText id="contactHouseNumber" styleClass="data_field" value="#{userController.user.userContact.contactHouseNumber}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactZipCode" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_ZIP_CODE}" />
+
+					<h:outputText id="contactZipCode" styleClass="data_field" value="#{userController.user.userContact.contactZipCode}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactCity" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_CITY}" />
+
+					<h:outputText id="contactCity" styleClass="data_field" value="#{userController.user.userContact.contactCity}" />
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactEmailAddress" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_EMAIL_ADDRESS}" />
+
+					<h:outputLink id="contactEmailAddress" styleClass="data_field" value="mailto:#{userController.user.userContact.contactEmailAddress}">
+						<h:outputText value="#{userController.user.userContact.contactEmailAddress}" />
+					</h:outputLink>
+				</h:column>
+
+				<h:column>
+					<h:outputLabel for="contactBirthday" styleClass="data_label" value="#{msg.ADMIN_SHOW_USER_BIRTHDAY}" />
+
+					<h:outputText id="contactBirthday" styleClass="data_field" value="#{userController.user.userContact.contactBirthday.time}">
+						<f:convertDateTime for="contactBirthday" type="date" />
+					</h:outputText>
+				</h:column>
+			</h:panelGrid>
+
+			<ui:include src="/WEB-INF/templates/admin/user/admin_user_links.tpl">
+				<ui:param name="user" value="#{userController.user}" />
+			</ui:include>
+
+			<ui:include src="/WEB-INF/templates/admin/cellphone/admin_cellphone_data.tpl">
+				<ui:param name="cellphoneNumber" value="#{userController.user.userContact.contactCellphoneNumber}" />
+				<ui:param name="user" value="#{userController.user}" />
+			</ui:include>
+		</ui:define>
+	</ui:composition>
+</html>
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
new file mode 100644
index 00000000..68da193c
--- /dev/null
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!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:h="http://xmlns.jcp.org/jsf/html"
+	  xmlns:f="http://xmlns.jcp.org/jsf/core"
+	  >
+
+	<ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
+		<ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_UNLOCK_USER}</ui:define>
+
+		<ui:define name="content_header">
+			#{msg.CONTENT_TITLE_ADMIN_UNLOCK_USER}
+		</ui:define>
+
+		<ui:define name="content">
+			Here goes your content.
+		</ui:define>
+	</ui:composition>
+</html>