diff --git a/admin/admin.db b/admin/admin.db
index 37d364f..4aa6f05 100644
Binary files a/admin/admin.db and b/admin/admin.db differ
diff --git a/admin/php/criabanco.php b/admin/php/criabanco.php
index c0f1d17..7d21b0e 100644
--- a/admin/php/criabanco.php
+++ b/admin/php/criabanco.php
@@ -161,7 +161,7 @@
 			$dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES('Podem editar dados geograficos',4,'editoresgeo')");
 			$dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papeis VALUES ('Podem administrar o sistema METAESTAT','5', 'adminmetaestat')");
 			//usuarios - inclui apenas o admin
-			$dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_usuarios VALUES(1,'','',1,'admin','admin','admin')");
+			$dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_usuarios VALUES(1,'','',0,'admingeral','admingeral','admingeral')");
 			//papel do usuario
 			$dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_papelusuario VALUES(1,1)");
 			//operacoes controladas
diff --git a/admin/php/login.php b/admin/php/login.php
index a2660d6..0886066 100644
--- a/admin/php/login.php
+++ b/admin/php/login.php
@@ -236,28 +236,50 @@ function validaSessao(){
 function autenticaUsuario($usuario,$senha){
 	include(__DIR__."/conexao.php");
 	$senhamd5 = md5($senha);
-	$dados = pegaDados("select * from ".$esquemaadmin."i3geousr_usuarios where login = '$usuario' and (senha = '$senhamd5' or senha = '$senha') and ativo = 1",$locaplic);
-	if(count($dados) > 0){
-		$pa = pegaDados("select * from ".$esquemaadmin."i3geousr_papelusuario where id_usuario = ".$dados[0]["id_usuario"],$locaplic);
-		$op = pegadados("SELECT O.codigo, PU.id_usuario FROM ".$esquemaadmin."i3geousr_operacoes AS O JOIN ".$esquemaadmin."i3geousr_operacoespapeis AS OP ON O.id_operacao = OP.id_operacao JOIN ".$esquemaadmin."i3geousr_papelusuario AS PU ON OP.id_papel = PU.id_papel	WHERE id_usuario = ".$dados[0]["id_usuario"],$locaplic);
-		$gr = pegadados("SELECT * from ".$esquemaadmin."i3geousr_grupousuario where id_usuario = ".$dados[0]["id_usuario"]);
-		$operacoes = array();
-		foreach($op as $o){
-			$operacoes[$o["codigo"]] = true;
-		}
-		$papeis = array();
-		foreach($pa as $p){
-			$papeis[] = $p["id_papel"];
-		}
-		$gruposusr = array();
-		foreach($gr as $p){
-			$gruposusr[] = $p["id_grupo"];
-		}
-		$r = array("usuario"=>$dados[0],"papeis"=>$papeis,"operacoes"=>$operacoes,"gruposusr"=>$gruposusr);
+	//verifica se o usuario esta cadastrado no ms_configura.php em $i3geomaster
+	if(verificaMaster($usuario,$senha) == true){
+		$pa = pegaDados("select * from ".$esquemaadmin."i3geousr_papelusuario ",$locaplic);
+		$op = pegadados("SELECT O.codigo, PU.id_usuario FROM ".$esquemaadmin."i3geousr_operacoes AS O JOIN ".$esquemaadmin."i3geousr_operacoespapeis AS OP ON O.id_operacao = OP.id_operacao JOIN ".$esquemaadmin."i3geousr_papelusuario AS PU ON OP.id_papel = PU.id_papel	",$locaplic);
+		$gr = pegadados("SELECT * from ".$esquemaadmin."i3geousr_grupousuario ");
+		$operacoes = array();
+		foreach($op as $o){
+			$operacoes[$o["codigo"]] = true;
+		}
+		$papeis = array();
+		foreach($pa as $p){
+			$papeis[] = $p["id_papel"];
+		}
+		$gruposusr = array();
+		foreach($gr as $p){
+			$gruposusr[] = $p["id_grupo"];
+		}
+		$r = array("usuario"=>"master","papeis"=>$papeis,"operacoes"=>$operacoes,"gruposusr"=>$gruposusr);
 		return $r;
 	}
 	else{
-		return false;
+		$dados = pegaDados("select * from ".$esquemaadmin."i3geousr_usuarios where login = '$usuario' and (senha = '$senhamd5' or senha = '$senha') and ativo = 1",$locaplic);
+		if(count($dados) > 0){
+			$pa = pegaDados("select * from ".$esquemaadmin."i3geousr_papelusuario where id_usuario = ".$dados[0]["id_usuario"],$locaplic);
+			$op = pegadados("SELECT O.codigo, PU.id_usuario FROM ".$esquemaadmin."i3geousr_operacoes AS O JOIN ".$esquemaadmin."i3geousr_operacoespapeis AS OP ON O.id_operacao = OP.id_operacao JOIN ".$esquemaadmin."i3geousr_papelusuario AS PU ON OP.id_papel = PU.id_papel	WHERE id_usuario = ".$dados[0]["id_usuario"],$locaplic);
+			$gr = pegadados("SELECT * from ".$esquemaadmin."i3geousr_grupousuario where id_usuario = ".$dados[0]["id_usuario"]);
+			$operacoes = array();
+			foreach($op as $o){
+				$operacoes[$o["codigo"]] = true;
+			}
+			$papeis = array();
+			foreach($pa as $p){
+				$papeis[] = $p["id_papel"];
+			}
+			$gruposusr = array();
+			foreach($gr as $p){
+				$gruposusr[] = $p["id_grupo"];
+			}
+			$r = array("usuario"=>$dados[0],"papeis"=>$papeis,"operacoes"=>$operacoes,"gruposusr"=>$gruposusr);
+			return $r;
+		}
+		else{
+			return false;
+		}
 	}
 }
 function logoutUsuario(){
diff --git a/admin/php/upgradebanco46_47.php b/admin/php/upgradebanco46_47.php
index 275b825..4a79594 100644
--- a/admin/php/upgradebanco46_47.php
+++ b/admin/php/upgradebanco46_47.php
@@ -136,7 +136,7 @@ if(!in_array($teste,5))
 
 $teste = lista("select * from ".$esquemaadmin."i3geousr_usuarios","id_usuario");
 if(!in_array($teste,1))
-	$dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_usuarios VALUES(1,'','',1,'admin','admin','admin')");
+	$dbhw->query("INSERT INTO ".$esquemaadmin."i3geousr_usuarios VALUES(1,'','',0,'admingeral','admingeral','admingeral')");
 
 $teste = lista("select * from ".$esquemaadmin."i3geousr_papelusuario","id_usuario","id_papel");
 if(!in_array($teste,"1-1"))
diff --git a/admin/sql/usuarios_basededados.sql b/admin/sql/usuarios_basededados.sql
index cd73e7b..e6a2bce 100644
--- a/admin/sql/usuarios_basededados.sql
+++ b/admin/sql/usuarios_basededados.sql
@@ -1,5 +1,5 @@
 -- i3geousr_usuarios
-INSERT INTO i3geousr_usuarios (id_usuario, ativo, data_cadastro, email, login, nome_usuario, senha) VALUES ('1', '1', '', '', 'admin', 'administrador do i3geo', 'admin');
+INSERT INTO i3geousr_usuarios (id_usuario, ativo, data_cadastro, email, login, nome_usuario, senha) VALUES ('1', '0', '', '', 'admingeral', 'administrador do i3geo', 'admingeral');
 INSERT INTO i3geousr_usuarios (id_usuario, ativo, data_cadastro, email, login, nome_usuario, senha) VALUES ('2', '1', '', '', 'editor', 'teste de editor', 'editor');
 INSERT INTO i3geousr_usuarios (id_usuario, ativo, data_cadastro, email, login, nome_usuario, senha) VALUES ('3', '1', '', '', 'publicador', 'teste de publicador', 'publicador');
 INSERT INTO i3geousr_usuarios (id_usuario, ativo, data_cadastro, email, login, nome_usuario, senha) VALUES ('4', '1', '', '', 'editorgeo', 'teste de editor geo', 'editorgeo');
diff --git a/documentacao/diagramas/cadastrodeusuarios.erm b/documentacao/diagramas/cadastrodeusuarios.erm
index 7e4e97d..3533e80 100644
--- a/documentacao/diagramas/cadastrodeusuarios.erm
+++ b/documentacao/diagramas/cadastrodeusuarios.erm
@@ -110,7 +110,7 @@
 			</connections>
 			<display>false</display>
 			<creation_date>2012-07-19 01:51:14</creation_date>
-			<updated_date>2012-11-28 09:04:26</updated_date>
+			<updated_date>2012-11-28 13:56:34</updated_date>
 			<model_property>
 				<name>Project Name</name>
 				<value></value>
@@ -656,7 +656,7 @@
 			<connections>
 				<relation>
 					<id>0</id>
-					<source>4</source>
+					<source>1</source>
 					<target>2</target>
 					<child_cardinality>1..n</child_cardinality>
 					<parent_cardinality>1</parent_cardinality>
@@ -673,7 +673,7 @@
 				</relation>
 				<relation>
 					<id>1</id>
-					<source>1</source>
+					<source>4</source>
 					<target>2</target>
 					<child_cardinality>1..n</child_cardinality>
 					<parent_cardinality>1</parent_cardinality>
@@ -699,7 +699,7 @@
 				<normal_column>
 					<id>7</id>
 					<referenced_column>0</referenced_column>
-					<relation>1</relation>
+					<relation>0</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -732,7 +732,7 @@
 				<normal_column>
 					<id>8</id>
 					<referenced_column>11</referenced_column>
-					<relation>0</relation>
+					<relation>1</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -787,7 +787,7 @@
 			<connections>
 				<relation>
 					<id>2</id>
-					<source>4</source>
+					<source>6</source>
 					<target>3</target>
 					<child_cardinality>1..n</child_cardinality>
 					<parent_cardinality>1</parent_cardinality>
@@ -804,7 +804,7 @@
 				</relation>
 				<relation>
 					<id>3</id>
-					<source>6</source>
+					<source>4</source>
 					<target>3</target>
 					<child_cardinality>1..n</child_cardinality>
 					<parent_cardinality>1</parent_cardinality>
@@ -830,7 +830,7 @@
 				<normal_column>
 					<id>9</id>
 					<referenced_column>16</referenced_column>
-					<relation>3</relation>
+					<relation>2</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -863,7 +863,7 @@
 				<normal_column>
 					<id>10</id>
 					<referenced_column>11</referenced_column>
-					<relation>2</relation>
+					<relation>3</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -989,7 +989,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>3</word_id>
+					<word_id>4</word_id>
 					<id>13</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1045,7 +1045,7 @@
 			<connections>
 				<relation>
 					<id>4</id>
-					<source>7</source>
+					<source>1</source>
 					<target>5</target>
 					<child_cardinality>1..n</child_cardinality>
 					<parent_cardinality>1</parent_cardinality>
@@ -1062,7 +1062,7 @@
 				</relation>
 				<relation>
 					<id>5</id>
-					<source>1</source>
+					<source>7</source>
 					<target>5</target>
 					<child_cardinality>1..n</child_cardinality>
 					<parent_cardinality>1</parent_cardinality>
@@ -1088,7 +1088,7 @@
 				<normal_column>
 					<id>14</id>
 					<referenced_column>0</referenced_column>
-					<relation>5</relation>
+					<relation>4</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -1121,7 +1121,7 @@
 				<normal_column>
 					<id>15</id>
 					<referenced_column>19</referenced_column>
-					<relation>4</relation>
+					<relation>5</relation>
 					<description></description>
 					<unique_key_name></unique_key_name>
 					<logical_name></logical_name>
@@ -1247,7 +1247,7 @@
 					</sequence>
 				</normal_column>
 				<normal_column>
-					<word_id>4</word_id>
+					<word_id>3</word_id>
 					<id>18</id>
 					<description></description>
 					<unique_key_name></unique_key_name>
@@ -1544,7 +1544,7 @@
 							</column_data>
 							<column_data>
 								<column_id>1</column_id>
-								<value>1</value>
+								<value>0</value>
 							</column_data>
 							<column_data>
 								<column_id>2</column_id>
@@ -1556,7 +1556,7 @@
 							</column_data>
 							<column_data>
 								<column_id>4</column_id>
-								<value>admin</value>
+								<value>admingeral</value>
 							</column_data>
 							<column_data>
 								<column_id>5</column_id>
@@ -1564,7 +1564,7 @@
 							</column_data>
 							<column_data>
 								<column_id>6</column_id>
-								<value>admin</value>
+								<value>admingeral</value>
 							</column_data>
 						</data>
 						<data>
diff --git a/documentacao/manual-admin-i3geo-4_7-pt.odt b/documentacao/manual-admin-i3geo-4_7-pt.odt
index 7c23b11..a976337 100644
Binary files a/documentacao/manual-admin-i3geo-4_7-pt.odt and b/documentacao/manual-admin-i3geo-4_7-pt.odt differ
diff --git a/documentacao/manual-admin-i3geo-4_7-pt.pdf b/documentacao/manual-admin-i3geo-4_7-pt.pdf
index cc82f85..d19c1c2 100644
Binary files a/documentacao/manual-admin-i3geo-4_7-pt.pdf and b/documentacao/manual-admin-i3geo-4_7-pt.pdf differ
diff --git a/ferramentas/tabela/index.js b/ferramentas/tabela/index.js
index cd334b3..9cb0b36 100644
--- a/ferramentas/tabela/index.js
+++ b/ferramentas/tabela/index.js
@@ -41,7 +41,7 @@ Free Software Foundation, Inc., no endere&ccedil;o
 if(typeof(i3GEOF) === 'undefined'){
 	var i3GEOF = {};
 }
-
+//TODO documentar a opcao de relacionamento entre tabelas no manual de usuario
 /*
 Classe: i3GEOF.tabela
 */
diff --git a/init/dicionario.js b/init/dicionario.js
index 6200694..fed8f3a 100644
--- a/init/dicionario.js
+++ b/init/dicionario.js
@@ -5,5 +5,12 @@ pt:"Remover essa tela de apresenta&ccedil;&atilde;o (depois voc&ecirc; poder&aac
 en:"",
 es:"",
 it:""
+}],
+2: [
+{
+pt:"Teste da instala&ccedil;&atilde;o",
+en:"",
+es:"",
+it:""
 }]
 };
\ No newline at end of file
diff --git a/init/index.php b/init/index.php
index 50a86df..35a32df 100755
--- a/init/index.php
+++ b/init/index.php
@@ -72,14 +72,13 @@ h1{
 <div id="bandeiras" ></div>
 	<a href="remover.php" ><table class="r">
 		<tr>
-			<td><img src="../imagens/oxygen/22x22/dialog-close" /><br><script>document.write($trad(1,g_traducao_init));</script></script></a></td>
+			<td><img src="../imagens/oxygen/22x22/dialog-close" /><br><script>document.write($trad(1,g_traducao_init));</script></a></td>
 		</tr>
 	</table></a>
 
 	<a href="testei3geo" ><table class="r">
 		<tr>
-			<td><img src="../imagens/i3geo1.png" /><br>Servidor
-					de testes do i3Geo</a></td>
+			<td><img src="../imagens/i3geo1.png" /><br><script>document.write($trad(2,g_traducao_init));</script></a></td>
 		</tr>
 	</table></a>
 </body>
--
libgit2 0.21.2