=== modified file 'dhis-live/src/main/java/org/hisp/dhis/TrayApp.java'
--- dhis-live/src/main/java/org/hisp/dhis/TrayApp.java	2010-09-18 20:22:07 +0000
+++ dhis-live/src/main/java/org/hisp/dhis/TrayApp.java	2010-09-18 21:17:38 +0000
@@ -710,7 +710,7 @@
         } catch ( IOException ex )
         {
             log.error( "Error with Hibernate Properties: " + ex.getMessage() );
-            JOptionPane.showMessageDialog( null, "Error with Hibernate Properties", ex.getMessage(), JOptionPane.ERROR_MESSAGE );
+            JOptionPane.showMessageDialog( null, "Error with Hibernate Properties: \n" + ex.getMessage(), "Configuration error", JOptionPane.ERROR_MESSAGE );
             System.exit( 1 );
         }
     }

=== modified file 'dhis2-live-installer/INSTALLER-README.txt'
--- dhis2-live-installer/INSTALLER-README.txt	2010-09-18 19:24:24 +0000
+++ dhis2-live-installer/INSTALLER-README.txt	2010-09-18 21:17:38 +0000
@@ -26,17 +26,22 @@
 
 1) This variable should point to your local copy of the JDK. 
  JAVA_HOME=/usr/local/java/jdk1.6.0_10/
+ 
 2) Be sure that maven is accessible in your path. 
  PATH=$PATH:/home/wheel/apache-maven-2.2.1/bin/
+ 
 3) This variable is necessary during  the installer build process and should point to your local copy of the
 BitRock install builder directory. You can get a copy of BitRock install builder from here
 http://installbuilder.bitrock.com/download-step-2.html. Install it somewhere on your system and
 point the environment variable to the correct directory.
  BITROCK_HOME=/home/wheel/installbuilder-6.2.7/
+ 
 4) This variable should point to the directory where the birt.war file resides. If not set BIRT will be omitted.
  BIRT_WAR="/usr/local/apache-tomcat-6.0.18/webapps/"
+ 
 5) This variable should point to the root directory of the source of the documentation branch.  
  DHIS2_DOCS="/home/wheel/workspace/dhis2-docbook-docs/"
+ 
 6) This variable should point to your copy of the dhis2 main source branch. 
  DHIS2_SRC="/home/wheel/workspace/dhis2"
 
@@ -62,14 +67,24 @@
 There are a number of different installers that will be generated for different purposes. 
 
 1)DHIS2 Windows Live
-This version of the installer is appropriate for Microsoft Windows with a pre-existing JRE. 
+
+This version of the installer is appropriate for Microsoft Windows with a pre-existing JRE.
+
 2) DHIS2 Windows Embedded JRE
-This version of the installer will include a pre-packed JRE (Java Runtime Edition) with the installer. 
-This version therefore will not require a user to have Java pre-installed on their machine, but will 
-increase the size of the installer by about 30 MB. Place a copy of the JRE in the /resources/jre/jre6 folder.
-Note that the JRE is referring to the extracted collection of files, not the Windows executable installer.
+
+This version of the installer will include a pre-packed:
+
+o JRE (Java Runtime Edition). This version therefore will not require a user to have Java pre-installed on their machine, but will 
+increase the size of the installer by about 30 MB. Place a copy of the JRE in /resources/jre/jre6.
+Note that JRE is referring to the extracted collection of files, not the Windows executable installer.
 One way to obtain this is to install JRE on Windows and copy the extracted JRE directory into this project.
 
+o Firefix browser. Place a copy of Firefox Portable in /resources/browser/FirefoxPortable. Note that Firefox portable is referring
+to the extracted collection of files, not the Windows executable installer. One way to obtain this is to install Firefox portable
+on Windows and copy the extracted FirefoxPortable directory into this project.
+
+o Demo database. Place a copy of the H2 demo database (called "demo.h2.db") into resources/demodb.
+
 
 You will now enter into a rather lengthy
 process depending on the speed of your machine. At the end you will

=== modified file 'dhis2-live-installer/pom.xml'
--- dhis2-live-installer/pom.xml	2010-09-15 09:44:37 +0000
+++ dhis2-live-installer/pom.xml	2010-09-18 21:17:38 +0000
@@ -19,7 +19,7 @@
              <phase>package</phase>
                <configuration>
                 <executable>${env.BITROCK_HOME}/bin/builder</executable>
-          	<arguments>
+				<arguments>
                 <argument>build</argument>
                 <argument>${basedir}/src/bitrock/DHIS2_lite.xml</argument>
                 <argument>windows</argument>
@@ -43,8 +43,8 @@
              <goals>
               <goal>exec</goal>
             </goals>
-          </execution> 
-	   <execution>
+          </execution>
+		  <execution>
              <id>DHIS2 Windows Embedded JRE French Version</id>
              <phase>package</phase>
                <configuration>

=== modified file 'dhis2-live-installer/src/bitrock/DHIS2_demo_birt.xml'
--- dhis2-live-installer/src/bitrock/DHIS2_demo_birt.xml	2010-09-18 18:32:56 +0000
+++ dhis2-live-installer/src/bitrock/DHIS2_demo_birt.xml	2010-09-18 21:17:38 +0000
@@ -175,7 +175,7 @@
             <name>birt</name>
             <description>Birt Reporting Framework</description>
             <canBeEdited>1</canBeEdited>
-            <detailedDescription>The Birt Reporting Framework. Install this compoenent if you plan to use BIRT reports.</detailedDescription>
+            <detailedDescription>The Birt Reporting Framework. Install this component if you plan to use BIRT reports.</detailedDescription>
             <selected>0</selected>
             <show>1</show>
             <folderList>
@@ -219,22 +219,7 @@
                     <platforms>all</platforms>
                     <distributionFileList>
                         <distributionFile>
-                            <origin>../../resources/demodb/database.h2.db</origin>
-                        </distributionFile>
-                        <distributionFile>
-                            <origin>../../resources/demodb/database.trace.db</origin>
-                        </distributionFile>
-                        <distributionFile>
-                            <origin>../../resources/demodb/dhis2.12.log.db</origin>
-                        </distributionFile>
-                        <distributionFile>
-                            <origin>../../resources/demodb/dhis2.data.db</origin>
-                        </distributionFile>
-                        <distributionFile>
-                            <origin>../../resources/demodb/dhis2.index.db</origin>
-                        </distributionFile>
-                        <distributionFile>
-                            <origin>../../resources/demodb/dhis2.trace.db</origin>
+                            <origin>../../resources/demodb/demo.h2.db</origin>
                         </distributionFile>
                     </distributionFileList>
                 </folder>

=== modified file 'dhis2-live-installer/src/bitrock/DHIS2_live_embedded.xml'
--- dhis2-live-installer/src/bitrock/DHIS2_live_embedded.xml	2010-09-18 18:22:57 +0000
+++ dhis2-live-installer/src/bitrock/DHIS2_live_embedded.xml	2010-09-18 21:17:38 +0000
@@ -242,6 +242,26 @@
                 </folder>
             </folderList>
         </component>
+		<component>
+            <name>demodb</name>
+            <description>Demo database</description>
+            <canBeEdited>1</canBeEdited>
+            <selected>1</selected>
+            <show>1</show>
+            <folderList>
+                <folder>
+                    <description>demodb</description>
+                    <destination>${installdir}/database</destination>
+                    <name>demodb</name>
+                    <platforms>all</platforms>
+                    <distributionFileList>
+                        <distributionFile>
+                            <origin>../../resources/demodb/demo.h2.db</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
+            </folderList>
+        </component>
     </componentList>
     <finalPageActionList>
         <runProgram>

=== modified file 'dhis2-live-installer/src/bitrock/DHIS2_live_embedded_fr.xml'
--- dhis2-live-installer/src/bitrock/DHIS2_live_embedded_fr.xml	2010-09-18 18:22:57 +0000
+++ dhis2-live-installer/src/bitrock/DHIS2_live_embedded_fr.xml	2010-09-18 21:17:38 +0000
@@ -244,6 +244,26 @@
                 </folder>
             </folderList>
         </component>
+		<component>
+            <name>demodb</name>
+            <description>Demo database</description>
+            <canBeEdited>1</canBeEdited>
+            <selected>1</selected>
+            <show>1</show>
+            <folderList>
+                <folder>
+                    <description>demodb</description>
+                    <destination>${installdir}/database</destination>
+                    <name>demodb</name>
+                    <platforms>all</platforms>
+                    <distributionFileList>
+                        <distributionFile>
+                            <origin>../../resources/demodb/demo.h2.db</origin>
+                        </distributionFile>
+                    </distributionFileList>
+                </folder>
+            </folderList>
+        </component>
     </componentList>
     <finalPageActionList>
         <runProgram>