Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r31037d3d873f87b6c212f635ed7f6ed3f4216a7b -r0c2c50f423b257e4c110335200a6e1c93d0eda58
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 31037d3d873f87b6c212f635ed7f6ed3f4216a7b)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0c2c50f423b257e4c110335200a6e1c93d0eda58)
@@ -363,6 +363,8 @@
 cache.explanation3  =Warning: If you remove a node, you will remove the node and all its child nodes.
 msg.ldap.synchronise.intro  =This feature allows you to synchronise LAMS' database with your LDAP server.  This includes updating existing users' profile and adding them to the LAMS group which matches their attributes.
 msg.import.3  =Download the roles template to add users to groups/subgroups and assign their roles.
+config.gmap.section.title =Gmap Settings
+config.gmap.gmapkey  =Google Map key.
 
 
 #======= End labels: Exported 356 labels for en AU =====
Index: lams_common/db/sql/insert_lams_unix_config_data.sql
===================================================================
diff -u -r54ef0116a2f7ec7ccb49f782a674229b66ab1c58 -r0c2c50f423b257e4c110335200a6e1c93d0eda58
--- lams_common/db/sql/insert_lams_unix_config_data.sql	(.../insert_lams_unix_config_data.sql)	(revision 54ef0116a2f7ec7ccb49f782a674229b66ab1c58)
+++ lams_common/db/sql/insert_lams_unix_config_data.sql	(.../insert_lams_unix_config_data.sql)	(revision 0c2c50f423b257e4c110335200a6e1c93d0eda58)
@@ -1,5 +1,5 @@
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('ServerURL','http://shaun.melcoe.mq.edu.au/lams/', 'config.server.url', 'config.header.system', 'STRING', 1);
+values ('ServerURL','http://192.168.111.40:8080/lams/', 'config.server.url', 'config.header.system', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
 values ('ServerURLContextPath','lams/', 'config.server.url.context.path', 'config.header.system', 'STRING', 1);
@@ -233,4 +233,7 @@
 values ('LearnerScreenSize','800x600', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
\ No newline at end of file
+values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('GmapKey','', 'config.gmap.gmapkey', 'config.gmap.section.title', 'STRING', 0);
\ No newline at end of file
Index: lams_common/db/sql/insert_lams_windows_config_data.sql
===================================================================
diff -u -r54ef0116a2f7ec7ccb49f782a674229b66ab1c58 -r0c2c50f423b257e4c110335200a6e1c93d0eda58
--- lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision 54ef0116a2f7ec7ccb49f782a674229b66ab1c58)
+++ lams_common/db/sql/insert_lams_windows_config_data.sql	(.../insert_lams_windows_config_data.sql)	(revision 0c2c50f423b257e4c110335200a6e1c93d0eda58)
@@ -233,4 +233,7 @@
 values ('LearnerScreenSize','800x600', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
\ No newline at end of file
+values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('GmapKey','', 'config.gmap.gmapkey', 'config.gmap.section.title', 'STRING', 0);
\ No newline at end of file
Index: lams_common/db/sql/insert_rams_unix_config_data.sql
===================================================================
diff -u -r54ef0116a2f7ec7ccb49f782a674229b66ab1c58 -r0c2c50f423b257e4c110335200a6e1c93d0eda58
--- lams_common/db/sql/insert_rams_unix_config_data.sql	(.../insert_rams_unix_config_data.sql)	(revision 54ef0116a2f7ec7ccb49f782a674229b66ab1c58)
+++ lams_common/db/sql/insert_rams_unix_config_data.sql	(.../insert_rams_unix_config_data.sql)	(revision 0c2c50f423b257e4c110335200a6e1c93d0eda58)
@@ -233,4 +233,7 @@
 values ('LearnerScreenSize','800x600', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
\ No newline at end of file
+values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('GmapKey','', 'config.gmap.gmapkey', 'config.gmap.section.title', 'STRING', 0);
Index: lams_common/db/sql/insert_rams_windows_config_data.sql
===================================================================
diff -u -r54ef0116a2f7ec7ccb49f782a674229b66ab1c58 -r0c2c50f423b257e4c110335200a6e1c93d0eda58
--- lams_common/db/sql/insert_rams_windows_config_data.sql	(.../insert_rams_windows_config_data.sql)	(revision 54ef0116a2f7ec7ccb49f782a674229b66ab1c58)
+++ lams_common/db/sql/insert_rams_windows_config_data.sql	(.../insert_rams_windows_config_data.sql)	(revision 0c2c50f423b257e4c110335200a6e1c93d0eda58)
@@ -233,4 +233,7 @@
 values ('LearnerScreenSize','800x600', 'config.learner.screen.size', 'config.header.look.feel', 'STRING', 1);
 
 insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
-values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
\ No newline at end of file
+values ('AdminScreenSize','800x600', 'config.admin.screen.size', 'config.header.look.feel', 'STRING', 1);
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) 
+values ('GmapKey','', 'config.gmap.gmapkey', 'config.gmap.section.title', 'STRING', 0);
\ No newline at end of file
Index: lams_common/db/sql/updatescripts/alter_211_gmap.sql
===================================================================
diff -u
--- lams_common/db/sql/updatescripts/alter_211_gmap.sql	(revision 0)
+++ lams_common/db/sql/updatescripts/alter_211_gmap.sql	(revision 0c2c50f423b257e4c110335200a6e1c93d0eda58)
@@ -0,0 +1,4 @@
+-- FOR LAMS 2.1.1 
+-- Adding a configuration entry into for the google map api key
+
+insert into lams_configuration (config_key, config_value, description_key, header_name, format, required)  values ('GmapKey','', 'config.gmap.gmapkey', 'config.gmap.section.title', 'STRING', 0);
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
===================================================================
diff -u -r79a6575d49778884cc7d23d028fe14e70ad04a4b -r0c2c50f423b257e4c110335200a6e1c93d0eda58
--- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision 79a6575d49778884cc7d23d028fe14e70ad04a4b)
+++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(.../ConfigurationKeys.java)	(revision 0c2c50f423b257e4c110335200a6e1c93d0eda58)
@@ -225,4 +225,6 @@
 	public static String LEARNER_SCREEN_SIZE = "LearnerScreenSize";
 	public static String ADMIN_SCREEN_SIZE = "AdminScreenSize";
 	
+	public static String GMAP_KEY = "GmapKey";
+	
 }
\ No newline at end of file