Index: lams_tool_laqa/.classpath
===================================================================
diff -u -rdbc459a54a0eb6961b4c331f3174cc1fa4661f02 -r63a14a82c79d87539f49f17e2b57e930d8e70bb0
--- lams_tool_laqa/.classpath	(.../.classpath)	(revision dbc459a54a0eb6961b4c331f3174cc1fa4661f02)
+++ lams_tool_laqa/.classpath	(.../.classpath)	(revision 63a14a82c79d87539f49f17e2b57e930d8e70bb0)
@@ -3,8 +3,8 @@
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="src" path="test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3RDPARTY"/>
 	<classpathentry kind="lib" path="D:/eclipse/workspace/lams_tool_laqa/ext-lib/j2ee.jar"/>
 	<classpathentry kind="con" path="com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
Index: lams_tool_laqa/build.xml
===================================================================
diff -u -rf32464a75932af671c6649902b7a3a23f2087789 -r63a14a82c79d87539f49f17e2b57e930d8e70bb0
--- lams_tool_laqa/build.xml	(.../build.xml)	(revision f32464a75932af671c6649902b7a3a23f2087789)
+++ lams_tool_laqa/build.xml	(.../build.xml)	(revision 63a14a82c79d87539f49f17e2b57e930d8e70bb0)
@@ -207,8 +207,8 @@
 				<fileset dir="${build.classes.test}"/>
 				<fileset dir="${conf.hibernate.mapping.dir}"/>
 				<fileset dir="${build.web}"/>
-				<fileset dir="${build.web.includes}"/>
-				<fileset dir="${build.web.template}"/>
+				<!--<fileset dir="${build.web.includes}"/>-->
+				<!--<fileset dir="${build.web.template}"/>-->
 			</jar>
 		</target>
 	
Index: lams_tool_laqa/db/sql/activity_insert.sql
===================================================================
diff -u -rf1e14548cbdc97c2000d1f697271b093018575f3 -r63a14a82c79d87539f49f17e2b57e930d8e70bb0
--- lams_tool_laqa/db/sql/activity_insert.sql	(.../activity_insert.sql)	(revision f1e14548cbdc97c2000d1f697271b093018575f3)
+++ lams_tool_laqa/db/sql/activity_insert.sql	(.../activity_insert.sql)	(revision 63a14a82c79d87539f49f17e2b57e930d8e70bb0)
@@ -23,8 +23,6 @@
 , learning_library_id
 , create_date_time
 , run_offline_flag
-, offline_instructions
-, online_instructions
 , max_number_of_options
 , min_number_of_options
 , options_instructions
@@ -63,8 +61,6 @@
 , ${learning_library_id}
 , NOW()
 , 0
-, 'Do it yourself'
-, 'Do it in LAMS'
 , NULL
 , NULL
 , NULL
Index: lams_tool_laqa/db/sql/create_lams_tool_qa.sql
===================================================================
diff -u -rcb02e119f91b8af38f90cad3a8c8480081427453 -r63a14a82c79d87539f49f17e2b57e930d8e70bb0
--- lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision cb02e119f91b8af38f90cad3a8c8480081427453)
+++ lams_tool_laqa/db/sql/create_lams_tool_qa.sql	(.../create_lams_tool_qa.sql)	(revision 63a14a82c79d87539f49f17e2b57e930d8e70bb0)
@@ -1,4 +1,4 @@
-CREATE TABLE lams.tl_laqa11_content (
+CREATE TABLE tl_laqa11_content (
        qa_content_id BIGINT(20) NOT NULL
      , title VARCHAR(250) NOT NULL DEFAULT 'Questions and Answers'
      , instructions VARCHAR(250) NOT NULL DEFAULT 'Please, take a minute to answer the following questions.'
@@ -19,7 +19,7 @@
      , PRIMARY KEY (qa_content_id)
 )TYPE=InnoDB;
 
-CREATE TABLE lams.tl_laqa11_session (
+CREATE TABLE tl_laqa11_session (
        qa_session_id BIGINT(20) NOT NULL
      , session_start_date DATETIME
      , session_end_date DATETIME
@@ -31,7 +31,7 @@
                   REFERENCES lams.tl_laqa11_content (qa_content_id)
 )TYPE=InnoDB;
 
-CREATE TABLE lams.tl_laqa11_que_usr (
+CREATE TABLE tl_laqa11_que_usr (
        que_usr_id BIGINT(20) NOT NULL
      , username VARCHAR(100)
      , qa_session_id BIGINT(20) NOT NULL
@@ -42,7 +42,7 @@
                   REFERENCES lams.tl_laqa11_session (qa_session_id)
 )TYPE=InnoDB;
 
-CREATE TABLE lams.tl_laqa11_que_content (
+CREATE TABLE tl_laqa11_que_content (
        qa_que_content_id BIGINT(20) NOT NULL
      , question VARCHAR(255)
      , display_order INT(5)
@@ -53,7 +53,7 @@
                   REFERENCES lams.tl_laqa11_content (qa_content_id)
 )TYPE=InnoDB;
 
-CREATE TABLE lams.tl_laqa11_usr_resp (
+CREATE TABLE tl_laqa11_usr_resp (
        response_id BIGINT(20) NOT NULL
      , hidden TINYINT(1) DEFAULT 0
      , answer VARCHAR(255)
@@ -70,7 +70,7 @@
                   REFERENCES lams.tl_laqa11_que_usr (que_usr_id)
 )TYPE=InnoDB;
 
-CREATE TABLE lams.tl_laqa11_uploadedFile (
+CREATE TABLE tl_laqa11_uploadedFile (
        submissionId BIGINT(20) NOT NULL AUTO_INCREMENT
      , uuid VARCHAR(255) NOT NULL
      , isOnline_File TINYINT(1) NOT NULL
Index: lams_tool_laqa/db/sql/drop_lams_tool_qa.sql
===================================================================
diff -u -ra4b9dfe6935887930d266eedb191089ea52914cc -r63a14a82c79d87539f49f17e2b57e930d8e70bb0
--- lams_tool_laqa/db/sql/drop_lams_tool_qa.sql	(.../drop_lams_tool_qa.sql)	(revision a4b9dfe6935887930d266eedb191089ea52914cc)
+++ lams_tool_laqa/db/sql/drop_lams_tool_qa.sql	(.../drop_lams_tool_qa.sql)	(revision 63a14a82c79d87539f49f17e2b57e930d8e70bb0)
@@ -1,7 +1,7 @@
 
-DROP TABLE IF EXISTS lams.tl_laqa11_usr_resp;
-DROP TABLE IF EXISTS lams.tl_laqa11_que_usr;
-DROP TABLE IF EXISTS lams.tl_laqa11_que_content;
-DROP TABLE IF EXISTS lams.tl_laqa11_session;
-DROP TABLE IF EXISTS lams.tl_laqa11_content;
-DROP TABLE IF EXISTS lams.tl_laqa11_uploadedFile;
+DROP TABLE IF EXISTS tl_laqa11_usr_resp;
+DROP TABLE IF EXISTS tl_laqa11_que_usr;
+DROP TABLE IF EXISTS tl_laqa11_que_content;
+DROP TABLE IF EXISTS tl_laqa11_session;
+DROP TABLE IF EXISTS tl_laqa11_uploadedFile;
+DROP TABLE IF EXISTS tl_laqa11_content;
Index: lams_tool_laqa/db/sql/tool_insert.sql
===================================================================
diff -u -rf1e14548cbdc97c2000d1f697271b093018575f3 -r63a14a82c79d87539f49f17e2b57e930d8e70bb0
--- lams_tool_laqa/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision f1e14548cbdc97c2000d1f697271b093018575f3)
+++ lams_tool_laqa/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 63a14a82c79d87539f49f17e2b57e930d8e70bb0)
@@ -8,6 +8,8 @@
 service_name,
 tool_display_name,
 description,
+tool_identifier,
+tool_version,
 learning_library_id,
 default_tool_content_id,
 valid_flag,
@@ -31,6 +33,8 @@
 'qaService',
 'Question and Answer',
 'Question and Answer Tool Description',
+'qa',
+'1.1',
 NULL,
 NULL,
 0,