# HG changeset patch
# User Jaroslav Tulach <jtulach@netbeans.org>
# Date 1410163910 -7200
# Node ID 8ea23c9e50085aa1d671a1cae6b37c43917dda72
# Parent  11e5ac27a524b2efbd100aa912278fae49f74ec4# Parent  2f2a29ad26ef5235e95f1d0ae55d9cb7d0d7c1c7
Merging default branch to nbrwsr

diff -r 11e5ac27a524 -r 8ea23c9e5008 .hgignore
--- a/.hgignore	Fri Mar 21 15:02:25 2014 +0100
+++ b/.hgignore	Mon Sep 08 10:11:50 2014 +0200
@@ -1,3 +1,8 @@
 .*~
 .*\.orig$
 .*target/.*
+\.orig\..*$
+\.orig$
+\.chg\..*$
+\.rej$
+\.conflict\~$
diff -r 11e5ac27a524 -r 8ea23c9e5008 chat/client/pom.xml
--- a/chat/client/pom.xml	Fri Mar 21 15:02:25 2014 +0100
+++ b/chat/client/pom.xml	Mon Sep 08 10:11:50 2014 +0200
@@ -117,5 +117,19 @@
         <version>${bck2brwsr.version}</version>
         <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <artifactId>ko4j</artifactId>
+      <groupId>org.netbeans.html</groupId>
+      <type>jar</type>
+      <version>${net.java.html.version}</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <artifactId>net.java.html.boot</artifactId>
+      <groupId>org.netbeans.html</groupId>
+      <type>jar</type>
+      <version>${net.java.html.version}</version>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 </project>
diff -r 11e5ac27a524 -r 8ea23c9e5008 chat/server/pom.xml
--- a/chat/server/pom.xml	Fri Mar 21 15:02:25 2014 +0100
+++ b/chat/server/pom.xml	Mon Sep 08 10:11:50 2014 +0200
@@ -119,5 +119,12 @@
       <version>2.3.8</version>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <artifactId>ko-ws-tyrus</artifactId>
+      <groupId>org.netbeans.html</groupId>
+      <type>jar</type>
+      <version>${net.java.html.version}</version>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 </project>
diff -r 11e5ac27a524 -r 8ea23c9e5008 chess/pom.xml
--- a/chess/pom.xml	Fri Mar 21 15:02:25 2014 +0100
+++ b/chess/pom.xml	Mon Sep 08 10:11:50 2014 +0200
@@ -141,6 +141,11 @@
       <scope>provided</scope>
       <type>jar</type>
     </dependency>
+    <dependency>
+      <groupId>org.netbeans.html</groupId>
+      <artifactId>ko4j</artifactId>
+      <version>${net.java.html.version}</version>
+    </dependency>
   </dependencies>
   <profiles>
       <profile>
@@ -252,5 +257,78 @@
               </dependency>
           </dependencies>
       </profile>
+      <profile>
+          <id>teabrwsr</id>
+          <build>
+              <plugins>
+                  <plugin>
+                      <groupId>org.teavm</groupId>
+                      <artifactId>teavm-maven-plugin</artifactId>
+                      <version>${teavm.version}</version>
+                      <dependencies>
+                          <dependency>
+                              <groupId>org.teavm</groupId>
+                              <artifactId>teavm-classlib</artifactId>
+                              <version>${teavm.version}</version>
+                          </dependency>
+                          <!-- This module adds html4j support. It mainly includes JavaScriptBuilder support.
+                          Also there are some little patches to JCL emulation, that are required to pass TCK -->
+                          <dependency>
+                              <groupId>org.teavm</groupId>
+                              <artifactId>teavm-html4j</artifactId>
+                              <version>${teavm.version}</version>
+                          </dependency>
+                      </dependencies>
+                      <executions>
+                          <execution>
+                              <id>generate-minesweeper</id>
+                              <goals>
+                                  <goal>build-javascript</goal>
+                              </goals>
+                              <phase>process-classes</phase>
+                              <configuration>
+                                  <!-- Whether we want TeaVM to minify (obfuscate) the generated JavaScript -->
+                                  <minifying>false</minifying>
+                                  <properties>
+                                      <!-- This classes (separated with , ; space) will be available through vm.loadClass() -->
+                                      <html4j.entryPoints>org.apidesign.html.demo.chess.LoadMain</html4j.entryPoints>
+                                  </properties>
+                                  <!-- Don't include main page - we created it by ourselves -->
+                                  <mainPageIncluded>false</mainPageIncluded>
+                                  <!-- Merge runtime.js instead of putting as a separate file -->
+                                  <runtime>MERGED</runtime>
+                                  <!-- Name of the generated file -->
+                                  <targetFileName>bck2brwsr.js</targetFileName>
+                                  <targetDirectory>${project.build.directory}/teavm</targetDirectory>
+                                  <!-- This transformer adds null checks before virtual calls. It is not included
+                                  by default as we don't always need these null checks -->
+                                  <transformers>
+                                      <param>org.teavm.javascript.NullPointerExceptionTransformer</param>
+                                  </transformers>
+                              </configuration>
+                          </execution>
+                      </executions>
+                  </plugin>
+                  <plugin>
+                      <artifactId>maven-assembly-plugin</artifactId>
+                      <version>2.4</version>
+                      <executions>
+                          <execution>
+                              <id>distro-assembly</id>
+                              <phase>package</phase>
+                              <goals>
+                                  <goal>single</goal>
+                              </goals>
+                              <configuration>
+                                  <descriptors>
+                                      <descriptor>src/main/assembly/teabrwsr.xml</descriptor>
+                                  </descriptors>
+                              </configuration>
+                          </execution>
+                      </executions>                
+                  </plugin>      
+              </plugins>
+          </build>
+      </profile>
   </profiles>
 </project>
diff -r 11e5ac27a524 -r 8ea23c9e5008 chess/src/main/assembly/teabrwsr.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/chess/src/main/assembly/teabrwsr.xml	Mon Sep 08 10:11:50 2014 +0200
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  
+  <id>teabrwsr</id>
+  <formats>
+      <format>zip</format>
+  </formats>
+  <baseDirectory>public_html</baseDirectory>
+  <fileSets>
+      <fileSet>
+          <directory>src/main/webapp/pages</directory>
+          <outputDirectory>/</outputDirectory>
+          <filtered>true</filtered>
+      </fileSet>
+      <fileSet>
+          <directory>${project.build.directory}/teavm/</directory>
+          <outputDirectory>/</outputDirectory>
+          <filtered>false</filtered>
+      </fileSet>
+  </fileSets>
+</assembly>
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/AndroidManifest.xml
--- a/minesweeper/AndroidManifest.xml	Fri Mar 21 15:02:25 2014 +0100
+++ b/minesweeper/AndroidManifest.xml	Mon Sep 08 10:11:50 2014 +0200
@@ -33,23 +33,31 @@
         android:minSdkVersion="8"
         android:targetSdkVersion="16" />
 
-    <uses-permission android:name="android.permission.INTERNET" />
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
-        android:label="@string/app_name"
+        android:label="Minesweeper"
         android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen">
         <activity android:name="org.apidesign.brwsr.DlvkBrwsr" 
                   android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        
+        <!-- Configuration section. Defines: 
+           - the HTML page to load on start
+           - the class that contains the main initialization method
+           - name of the initialization method in the given class
+        -->
         <meta-data android:name="loadPage" android:value="file:///android_asset/pages/index.html" />
-        <meta-data android:name="loadClass" android:value="org.apidesign.demo.minesweeper.Main" />
-        <meta-data android:name="invoke" android:value="onPageLoad" />
+        <meta-data android:name="loadClass" android:value="org.apidesign.demo.minesweeper.MinesModel" />
+        <meta-data android:name="invoke" android:value="main" />
     </application>
-    
+
+    <!-- allows use of internet and also 'call-home' feature. See 
+      licensing section in Javadoc
+    -->    
+    <uses-permission android:name="android.permission.INTERNET" />
 </manifest>
\ No newline at end of file
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/Info.plist.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/Info.plist.xml	Mon Sep 08 10:11:50 2014 +0200
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>CFBundleDevelopmentRegion</key>
+        <string>en</string>
+        <key>CFBundleDisplayName</key>
+        <string>Fair Mines</string>
+        <key>CFBundleExecutable</key>
+        <string>MineSweeper</string>
+        <key>CFBundleIdentifier</key>
+        <string>jst</string>
+        <key>CFBundleInfoDictionaryVersion</key>
+        <string>6.0</string>
+        <key>CFBundleName</key>
+        <string>Fair Mines</string>
+        <key>CFBundlePackageType</key>
+        <string>APPL</string>
+        <key>CFBundleShortVersionString</key>
+        <string>2.3</string>
+        <key>CFBundleSignature</key>
+        <string>????</string>
+        <key>CFBundleVersion</key>
+        <string>1</string>
+        <key>NSHumanReadableCopyright</key>
+        <string>Copyright © 2014 Jaroslav Tulach. All rights reserved.</string>
+        <key>LSRequiresIPhoneOS</key>
+        <true/>
+        <key>UIDeviceFamily</key>
+        <array>
+            <integer>1</integer>
+            <integer>2</integer>
+        </array>
+        <key>UIRequiredDeviceCapabilities</key>
+        <array>
+            <string>armv7</string>
+        </array>
+        <key>UISupportedInterfaceOrientations</key>
+        <array>
+            <string>UIInterfaceOrientationPortrait</string>
+            <string>UIInterfaceOrientationLandscapeLeft</string>
+            <string>UIInterfaceOrientationLandscapeRight</string>
+            <string>UIInterfaceOrientationPortraitUpsideDown</string>
+        </array>
+    </dict>
+</plist>
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/nbactions-bck2brwsr.xml
--- a/minesweeper/nbactions-bck2brwsr.xml	Fri Mar 21 15:02:25 2014 +0100
+++ b/minesweeper/nbactions-bck2brwsr.xml	Mon Sep 08 10:11:50 2014 +0200
@@ -29,7 +29,7 @@
         <actionName>run</actionName>
         <goals>
             <goal>package</goal>
-            <goal>bck2brwsr:brwsr</goal>
+            <goal>bck2brwsr:show</goal>
         </goals>
         <properties>
             <skipTests>true</skipTests>
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/nbactions-ibrwsr.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/nbactions-ibrwsr.xml	Mon Sep 08 10:11:50 2014 +0200
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<actions>
+    <action>
+        <actionName>run</actionName>
+        <goals>
+            <goal>package</goal>
+            <goal>robovm:ipad-sim</goal>
+        </goals>
+    </action>
+</actions>
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/nbactions.xml
--- a/minesweeper/nbactions.xml	Fri Mar 21 15:02:25 2014 +0100
+++ b/minesweeper/nbactions.xml	Mon Sep 08 10:11:50 2014 +0200
@@ -24,22 +24,4 @@
     THE SOFTWARE.
 
 -->
-<actions>
-    <action>
-        <actionName>run</actionName>
-        <goals>
-            <goal>process-classes</goal>
-            <goal>exec:java</goal>
-        </goals>
-    </action>
-    <action>
-        <actionName>debug</actionName>
-        <goals>
-            <goal>process-classes</goal>
-            <goal>exec:java</goal>
-        </goals>
-        <properties>
-            <jpda.listen>maven</jpda.listen>
-        </properties>
-    </action>
 </actions>
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/pom.xml
--- a/minesweeper/pom.xml	Fri Mar 21 15:02:25 2014 +0100
+++ b/minesweeper/pom.xml	Mon Sep 08 10:11:50 2014 +0200
@@ -4,7 +4,7 @@
 
   <groupId>org.apidesign.demo</groupId>
   <artifactId>minesweeper</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>2.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <parent>
       <artifactId>demo</artifactId>
@@ -13,12 +13,20 @@
   </parent>
 
   <name>Mine Sweeper</name>
-
+  <description>
+      Demonstration of DukeScript rendering technology.
+      Plus old, good, simple and entertaining game.
+      Improve your coding skills by playing a game and 
+      meanwhile learn what a rendering technology of the
+      future is going to look like. Learn to use DukeScript:
+      Write once, display (and deploy) anywhere!
+  </description>
+  <url>http://html.java.net/</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <brwsr.startpage>pages/index.html</brwsr.startpage>
     <project.mainclass>org.apidesign.demo.minesweeper.Main</project.mainclass>
     <netbeans.compile.on.save>none</netbeans.compile.on.save>
+    <bck2brwsr.obfuscationlevel>FULL</bck2brwsr.obfuscationlevel>
   </properties>
   <build>
       <plugins>
@@ -90,7 +98,7 @@
     <dependency>
       <groupId>org.netbeans.html</groupId>
       <artifactId>nbrwsr</artifactId>
-      <version>${net.java.html.version}</version>
+      <version>${nb.html.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -109,6 +117,20 @@
           <build>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>2.4</version>
+                    <configuration>
+                        <archive>
+                            <manifest>
+                                <mainClass>${project.mainclass}</mainClass>
+                                <addClasspath>true</addClasspath>
+                                <classpathPrefix>lib/</classpathPrefix>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
+                <plugin>
                     <artifactId>maven-assembly-plugin</artifactId>
                     <version>2.4</version>
                     <executions>
@@ -141,13 +163,27 @@
           <id>bck2brwsr</id>
           <activation>
               <property>
-                  <name>brwsr</name>
                   <value>bck2brwsr</value>
+                  <name>show</name>
               </property>
           </activation>
           <build>
               <plugins>
                   <plugin>
+                      <groupId>org.apache.maven.plugins</groupId>
+                      <artifactId>maven-jar-plugin</artifactId>
+                      <version>2.4</version>
+                      <configuration>
+                          <archive>
+                              <manifest>
+                                  <mainClass>${project.mainclass}</mainClass>
+                                  <addClasspath>true</addClasspath>
+                                  <classpathPrefix>lib/</classpathPrefix>
+                              </manifest>
+                          </archive>
+                      </configuration>
+                  </plugin>
+                  <plugin>
                       <groupId>org.apidesign.bck2brwsr</groupId>
                       <artifactId>bck2brwsr-maven-plugin</artifactId>
                       <version>${bck2brwsr.version}</version>
@@ -155,12 +191,19 @@
                           <execution>
                               <goals>
                                   <goal>brwsr</goal>
+                                  <goal>aot</goal>
                               </goals>
                           </execution>
                       </executions>
                       <configuration>
-                          <directory>${basedir}/src/main/webapp/</directory>
-                          <startpage>${brwsr.startpage}</startpage>
+                          <obfuscation>${bck2brwsr.obfuscationlevel}</obfuscation>
+                          <directory>${project.build.directory}/${project.build.finalName}-bck2brwsr/public_html/</directory>
+                          <startpage>index.html</startpage>
+                          <classPathPrefix>lib</classPathPrefix>
+                          <mainJavaScript>${project.build.directory}/minesweeper.js</mainJavaScript>
+                          <exports>
+                              <export>org.apidesign.demo.minesweeper.MinesModel</export>
+                          </exports>
                       </configuration>
                   </plugin>
                   <plugin>
@@ -200,6 +243,17 @@
                   <classifier>rt</classifier>
               </dependency>
               <dependency>
+                  <groupId>org.netbeans.html</groupId>
+                  <artifactId>net.java.html.boot</artifactId>
+                  <version>${net.java.html.version}</version>
+                  <exclusions>
+                      <exclusion>
+                          <artifactId>asm</artifactId>
+                          <groupId>org.ow2.asm</groupId>
+                      </exclusion>
+                  </exclusions>
+              </dependency>
+              <dependency>
                   <groupId>org.apidesign.bck2brwsr</groupId>
                   <artifactId>ko-bck2brwsr</artifactId>
                   <version>${bck2brwsr.version}</version>
@@ -232,7 +286,7 @@
               <dependency>
                   <groupId>org.apidesign.brwsr</groupId>
                   <artifactId>dlvkbrwsr</artifactId>
-                  <version>0.5</version>
+                  <version>1.0-SNAPSHOT</version>
                   <type>jar</type>
               </dependency>
               <dependency>
@@ -250,17 +304,55 @@
           <build>
               <plugins>
                   <plugin>
+                      <groupId>com.filmon.maven</groupId>
+                      <artifactId>image-maven-plugin</artifactId>
+                      <version>1.1</version>
+                      <executions>
+                          <execution>
+                              <goals>
+                                  <goal>scale</goal>
+                              </goals>
+                              <configuration>
+                                  <outputDirectory>target/res</outputDirectory>
+                                  <images>
+                                      <image>
+                                          <source>src/main/icons/DukeSweeper.png</source>
+                                          <destination>drawable-hdpi/ic_launcher.png</destination>
+                                          <width>72</width>
+                                      </image>
+                                      <image>
+                                          <source>src/main/icons/DukeSweeper.png</source>
+                                          <destination>drawable-mdpi/ic_launcher.png</destination>
+                                          <width>48</width>
+                                      </image>
+                                      <image>
+                                          <source>src/main/icons/DukeSweeper.png</source>
+                                          <destination>drawable-xhdpi/ic_launcher.png</destination>
+                                          <width>96</width>
+                                      </image>
+                                      <image>
+                                          <source>src/main/icons/DukeSweeper.png</source>
+                                          <destination>drawable-xxhdpi/ic_launcher.png</destination>
+                                          <width>144</width>
+                                      </image>
+                                  </images>
+                              </configuration>
+                          </execution>
+                      </executions>
+                  </plugin>
+                  <plugin>
                       <groupId>com.jayway.maven.plugins.android.generation2</groupId>
                       <artifactId>android-maven-plugin</artifactId>
                       <version>${android.plugin.version}</version>
                       <extensions>true</extensions>
                       <configuration>
+                          <resourceDirectory>target/res</resourceDirectory>
                           <classifier>apk</classifier>
                           <attachJar>false</attachJar>
                           <apkDebug>debug</apkDebug>
                           <assetsDirectory>src/main/webapp</assetsDirectory>
                           <sdk>
-                              <platform>16</platform>
+                              <platform>19</platform>
                           </sdk>
                           <apk>
                               <metaIncludes>
@@ -304,15 +396,190 @@
                   </plugin>
               </plugins>
           </build>
-          
       </profile>
       <profile>
+          <id>teabrwsr</id>
+          <build>
+              <plugins>
+                  <plugin>
+                      <groupId>org.teavm</groupId>
+                      <artifactId>teavm-maven-plugin</artifactId>
+                      <version>${teavm.version}</version>
+                      <dependencies>
+                          <dependency>
+                              <groupId>org.teavm</groupId>
+                              <artifactId>teavm-classlib</artifactId>
+                              <version>${teavm.version}</version>
+                          </dependency>
+                          <!-- This module adds html4j support. It mainly includes JavaScriptBuilder support.
+                          Also there are some little patches to JCL emulation, that are required to pass TCK -->
+                          <dependency>
+                              <groupId>org.teavm</groupId>
+                              <artifactId>teavm-html4j</artifactId>
+                              <version>${teavm.version}</version>
+                          </dependency>
+                      </dependencies>
+                      <executions>
+                          <execution>
+                              <id>generate-minesweeper</id>
+                              <goals>
+                                  <goal>build-javascript</goal>
+                              </goals>
+                              <phase>process-classes</phase>
+                              <configuration>
+                                  <!-- Whether we want TeaVM to minify (obfuscate) the generated JavaScript -->
+                                  <minifying>false</minifying>
+                                  <properties>
+                                      <!-- This classes (separated with , ; space) will be available through vm.loadClass() -->
+                                      <html4j.entryPoints>org.apidesign.demo.minesweeper.MainBrwsr</html4j.entryPoints>
+                                  </properties>
+                                  <!-- Don't include main page - we created it by ourselves -->
+                                  <mainPageIncluded>false</mainPageIncluded>
+                                  <!-- Merge runtime.js instead of putting as a separate file -->
+                                  <runtime>MERGED</runtime>
+                                  <!-- Name of the generated file -->
+                                  <targetFileName>bck2brwsr.js</targetFileName>
+                                  <targetDirectory>${project.build.directory}/teavm</targetDirectory>
+                                  <!-- This transformer adds null checks before virtual calls. It is not included
+                                  by default as we don't always need these null checks -->
+                                  <transformers>
+                                      <param>org.teavm.javascript.NullPointerExceptionTransformer</param>
+                                  </transformers>
+                              </configuration>
+                          </execution>
+                      </executions>
+                  </plugin>
+                  <plugin>
+                      <artifactId>maven-assembly-plugin</artifactId>
+                      <version>2.4</version>
+                      <executions>
+                          <execution>
+                              <id>distro-assembly</id>
+                              <phase>package</phase>
+                              <goals>
+                                  <goal>single</goal>
+                              </goals>
+                              <configuration>
+                                  <descriptors>
+                                      <descriptor>src/main/assembly/teabrwsr.xml</descriptor>
+                                  </descriptors>
+                              </configuration>
+                          </execution>
+                      </executions>                
+                  </plugin>      
+              </plugins>
+          </build>
+      </profile>
+      <profile>
+          <id>ibrwsr</id>
+          <dependencies>
+              <dependency>
+                  <groupId>org.apidesign.brwsr</groupId>
+                  <artifactId>ibrwsr</artifactId>
+                  <version>0.8.3</version>
+                  <scope>runtime</scope>
+              </dependency>
+          </dependencies>
+          <build>
+              <plugins>
+                  <plugin>
+                      <groupId>com.filmon.maven</groupId>
+                      <artifactId>image-maven-plugin</artifactId>
+                      <version>1.1</version>
+                      <executions>
+                          <execution>
+                              <goals>
+                                  <goal>scale</goal>
+                              </goals>
+                              <configuration>
+                                  <outputDirectory>target/images</outputDirectory>
+                                  <images>
+                                      <image>
+                                          <source>src/main/icons/DukeSweeper.png</source>
+                                          <destination>Icon.png</destination>
+                                          <width>57</width>
+                                      </image>
+                                      <image>
+                                          <source>src/main/icons/DukeSweeper.png</source>
+                                          <destination>Icon@2.png</destination>
+                                          <width>114</width>
+                                      </image>
+                                      <image>
+                                          <source>src/main/icons/DukeSweeper.png</source>
+                                          <destination>Icon-60.png</destination>
+                                          <width>60</width>
+                                      </image>
+                                      <image>
+                                          <source>src/main/icons/DukeSweeper.png</source>
+                                          <destination>Icon-60@2.png</destination>
+                                          <width>120</width>
+                                      </image>
+                                      <image>
+                                          <source>src/main/icons/DukeSweeper.png</source>
+                                          <destination>Icon-72.png</destination>
+                                          <width>72</width>
+                                      </image>
+                                      <image>
+                                          <source>src/main/icons/DukeSweeper.png</source>
+                                          <destination>Icon-76.png</destination>
+                                          <width>76</width>
+                                      </image>
+                                  </images>
+                              </configuration>
+                          </execution>
+                      </executions>
+                  </plugin>
+                  <plugin>
+                      <groupId>org.robovm</groupId>
+                      <artifactId>robovm-maven-plugin</artifactId>
+                      <version>0.0.14.1</version>
+                      <configuration>
+                          <config>
+                              <mainClass>org.apidesign.demo.minesweeper.Main</mainClass>
+                              <forceLinkClasses>
+                                  <pattern>java.util.logging.ConsoleHandler</pattern>
+                                  <pattern>java.util.logging.SimpleFormatter</pattern>
+                                  <pattern>org.netbeans.html.ko4j.KO4J</pattern>
+                                  <pattern>org.netbeans.html.sound.impl.BrowserAudioEnv</pattern>
+                                  <pattern>org.apidesign.brwsr.IBrwsrPrsntr</pattern>
+                              </forceLinkClasses>
+                              <executableName>MineSweeper</executableName>
+                              <resources>
+                                  <resource>src/main/webapp/pages</resource>
+                                  <resource>
+                                      <targetPath>/</targetPath>
+                                      <directory>src/main/icons/</directory>
+                                      <includes>
+                                          <include>Default*.png</include>
+                                      </includes>
+                                  </resource>
+                                  <resource>
+                                      <targetPath>/</targetPath>
+                                      <directory>target/images/</directory>
+                                      <includes>
+                                          <include>*.png</include>
+                                      </includes>
+                                  </resource>
+                              </resources>
+                               <iosInfoPList>Info.plist.xml</iosInfoPList>
+                          </config>
+                          <includeJFX>false</includeJFX>
+                          <!--                      
+                          <iosSignIdentity>iPhone Distribution</iosSignIdentity>
+                          <iosProvisioningProfile>9728E91B-1BB7-40D6-8922-3DD3BA5E6ECD</iosProvisioningProfile> 
+                          -->
+                      </configuration>
+                  </plugin>
+              </plugins>
+          </build>
+      </profile>      
+      <profile>
           <id>nbrwsr</id>
           <dependencies>
               <dependency>
                   <groupId>org.netbeans.html</groupId>
                   <artifactId>nbrwsr</artifactId>
-                  <version>${net.java.html.version}</version>
+                  <version>${nb.html.version}</version>
                   <scope>compile</scope>
               </dependency>
           </dependencies>
@@ -356,7 +623,7 @@
                               <configuration>
                                   <useOSGiDependencies>true</useOSGiDependencies>
                                   <brandingToken>html4j4nb</brandingToken>
-                                  <cluster>html4j4nb</cluster>
+                                  <cluster>extra</cluster>
                                   <verifyIntegrity>false</verifyIntegrity>
                               </configuration>
                           </execution>                       
@@ -368,7 +635,7 @@
                               </goals>
                               <configuration>
                                   <useOSGiDependencies>true</useOSGiDependencies>
-                                  <cluster>html4j4nb</cluster>
+                                  <cluster>extra</cluster>
                                   <verifyIntegrity>false</verifyIntegrity>
                               </configuration>
                           </execution>
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/res/drawable-hdpi/ic_launcher.png
Binary file minesweeper/res/drawable-hdpi/ic_launcher.png has changed
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/res/drawable-mdpi/ic_launcher.png
Binary file minesweeper/res/drawable-mdpi/ic_launcher.png has changed
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/res/drawable-xhdpi/ic_launcher.png
Binary file minesweeper/res/drawable-xhdpi/ic_launcher.png has changed
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/res/drawable-xxhdpi/ic_launcher.png
Binary file minesweeper/res/drawable-xxhdpi/ic_launcher.png has changed
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/res/layout/activity_main.xml
--- a/minesweeper/res/layout/activity_main.xml	Fri Mar 21 15:02:25 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-<!--
-
-    The MIT License (MIT)
-
-    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin" >
-    
-    <Button android:layout_width="wrap_content"
-       android:layout_height="wrap_content"
-       android:text="@string/hello_world"
-       android:onClick="click"
-    />
-    
-</RelativeLayout>
\ No newline at end of file
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/res/menu/main.xml
--- a/minesweeper/res/menu/main.xml	Fri Mar 21 15:02:25 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-<!--
-
-    The MIT License (MIT)
-
-    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/action_settings"
-        android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
-
-</menu>
\ No newline at end of file
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/res/values-sw600dp/dimens.xml
--- a/minesweeper/res/values-sw600dp/dimens.xml	Fri Mar 21 15:02:25 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<!--
-
-    The MIT License (MIT)
-
-    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-<resources>
-
-    <!--
-         Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw600dp devices (e.g. 7" tablets) here.
-    -->
-
-</resources>
\ No newline at end of file
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/res/values-sw720dp-land/dimens.xml
--- a/minesweeper/res/values-sw720dp-land/dimens.xml	Fri Mar 21 15:02:25 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-<!--
-
-    The MIT License (MIT)
-
-    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-<resources>
-
-    <!--
-         Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
-    -->
-    <dimen name="activity_horizontal_margin">128dp</dimen>
-
-</resources>
\ No newline at end of file
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/res/values-v11/styles.xml
--- a/minesweeper/res/values-v11/styles.xml	Fri Mar 21 15:02:25 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-<!--
-
-    The MIT License (MIT)
-
-    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-<resources>
-
-    <!--
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.
-    -->
-    <style name="AppBaseTheme" parent="android:Theme.Holo.Light">
-        <!-- API 11 theme customizations can go here. -->
-    </style>
-
-</resources>
\ No newline at end of file
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/res/values-v14/styles.xml
--- a/minesweeper/res/values-v14/styles.xml	Fri Mar 21 15:02:25 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-<!--
-
-    The MIT License (MIT)
-
-    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-<resources>
-
-    <!--
-        Base application theme for API 14+. This theme completely replaces
-        AppBaseTheme from BOTH res/values/styles.xml and
-        res/values-v11/styles.xml on API 14+ devices.
-    -->
-    <style name="AppBaseTheme" parent="android:Theme.Holo.Light.DarkActionBar">
-        <!-- API 14 theme customizations can go here. -->
-    </style>
-
-</resources>
\ No newline at end of file
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/res/values/dimens.xml
--- a/minesweeper/res/values/dimens.xml	Fri Mar 21 15:02:25 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<!--
-
-    The MIT License (MIT)
-
-    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-<resources>
-
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
-
-</resources>
\ No newline at end of file
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/res/values/strings.xml
--- a/minesweeper/res/values/strings.xml	Fri Mar 21 15:02:25 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-
-    The MIT License (MIT)
-
-    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-<resources>
-
-    <string name="app_name">Minesweeper</string>
-    <string name="hello">Hello m4dlvk!</string>
-    <string name="action_settings">Settings</string>
-    <string name="hello_world">Hello world!</string>
-
-</resources>
\ No newline at end of file
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/res/values/styles.xml
--- a/minesweeper/res/values/styles.xml	Fri Mar 21 15:02:25 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-<!--
-
-    The MIT License (MIT)
-
-    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-<resources>
-
-</resources>
\ No newline at end of file
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/assembly/bck2brwsr.xml
--- a/minesweeper/src/main/assembly/bck2brwsr.xml	Fri Mar 21 15:02:25 2014 +0100
+++ b/minesweeper/src/main/assembly/bck2brwsr.xml	Mon Sep 08 10:11:50 2014 +0200
@@ -30,39 +30,36 @@
   <id>bck2brwsr</id>
   <formats>
       <format>zip</format>
+      <format>dir</format>
   </formats>
   <baseDirectory>public_html</baseDirectory>
-  <dependencySets>
-    <dependencySet>
-        <useProjectArtifact>false</useProjectArtifact>
-        <scope>runtime</scope>
-        <outputDirectory>lib</outputDirectory>
-        <includes>
-            <include>*:jar</include>
-            <include>*:rt</include>
-        </includes>
-    </dependencySet>
-    <dependencySet>
-        <useProjectArtifact>false</useProjectArtifact>
-        <scope>provided</scope>
-        <includes>
-            <include>*:js</include>
-        </includes>
-        <unpack>true</unpack>
-        <outputDirectory>/</outputDirectory>
-    </dependencySet>
-  </dependencySets> 
   <fileSets>
       <fileSet>
           <directory>src/main/webapp/pages</directory>
           <outputDirectory>/</outputDirectory>
           <filtered>true</filtered>
+          <includes>
+              <include>*.html</include>
+              <include>*.css</include>
+          </includes>
       </fileSet>
+      <fileSet>
+          <directory>src/main/webapp/pages</directory>
+          <outputDirectory>/</outputDirectory>
+          <filtered>false</filtered>
+          <excludes>
+              <exclude>*.html</exclude>
+              <exclude>*.css</exclude>
+          </excludes>
+      </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>bck2brwsr.js</include>
+                <include>minesweeper.js</include>
+                <include>lib/*.js</include>
+            </includes>
+        </fileSet>
   </fileSets>
-  <files>
-    <file>
-      <source>${project.build.directory}/${project.build.finalName}.jar</source>
-      <outputDirectory>/</outputDirectory>
-    </file>
-  </files>
 </assembly>
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/assembly/teabrwsr.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/src/main/assembly/teabrwsr.xml	Mon Sep 08 10:11:50 2014 +0200
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+  
+  <id>teabrwsr</id>
+  <formats>
+      <format>zip</format>
+  </formats>
+  <baseDirectory>public_html</baseDirectory>
+  <fileSets>
+      <fileSet>
+          <directory>src/main/webapp/pages</directory>
+          <outputDirectory>/</outputDirectory>
+          <filtered>true</filtered>
+      </fileSet>
+      <fileSet>
+          <directory>${project.build.directory}/teavm/</directory>
+          <outputDirectory>/</outputDirectory>
+          <filtered>false</filtered>
+      </fileSet>
+  </fileSets>
+</assembly>
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/icons/Default-568h@2x.png
Binary file minesweeper/src/main/icons/Default-568h@2x.png has changed
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/icons/Default.png
Binary file minesweeper/src/main/icons/Default.png has changed
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/icons/Default@2x.png
Binary file minesweeper/src/main/icons/Default@2x.png has changed
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/icons/DukeSweeper.png
Binary file minesweeper/src/main/icons/DukeSweeper.png has changed
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java
--- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java	Fri Mar 21 15:02:25 2014 +0100
+++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/Main.java	Mon Sep 08 10:11:50 2014 +0200
@@ -23,6 +23,7 @@
  */
 package org.apidesign.demo.minesweeper;
 
+import java.util.Locale;
 import net.java.html.boot.BrowserBuilder;
 import org.netbeans.api.nbrwsr.OpenHTMLRegistration;
 import org.openide.awt.ActionID;
@@ -34,13 +35,14 @@
 public final class Main {
     private Main() {
     }
-    
+
     /** Launches the browser */
-    public static void main(String... args) throws Exception {
+    public static void main(String... args) throws Exception {        
         BrowserBuilder.newBrowser().
             loadPage("pages/index.html").
-            loadClass(Main.class).
-            invoke("onPageLoad", args).
+            locale(Locale.getDefault()).
+            loadClass(MinesModel.class).
+            invoke("main", args).
             showAndWait();
         System.exit(0);
     }
@@ -61,7 +63,7 @@
     )
     @ActionReferences({
         @ActionReference(path = "Menu/Window"),
-        @ActionReference(path = "Toolbars/Run")
+        @ActionReference(path = "Toolbars/Games")
     })
     //
     // end of NetBeans actions registration
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/java/org/apidesign/demo/minesweeper/MainBrwsr.java
--- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MainBrwsr.java	Fri Mar 21 15:02:25 2014 +0100
+++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MainBrwsr.java	Mon Sep 08 10:11:50 2014 +0200
@@ -26,7 +26,7 @@
 public class MainBrwsr {
     static {
         try {
-            Main.onPageLoad();
+            MinesModel.main();
         } catch (Exception ex) {
             throw new IllegalStateException(ex);
         }
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java
--- a/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java	Fri Mar 21 15:02:25 2014 +0100
+++ b/minesweeper/src/main/java/org/apidesign/demo/minesweeper/MinesModel.java	Mon Sep 08 10:11:50 2014 +0200
@@ -39,9 +39,13 @@
     @Property(name = "state", type = MinesModel.GameState.class),
     @Property(name = "rows", type = Row.class, array = true),
 })
-final class MinesModel {
+public final class MinesModel {
     enum GameState {
-        IN_PROGRESS, WON, LOST;
+        IN_PROGRESS, MARKING_MINE, WON, LOST;
+    }
+    
+    @ComputedProperty static String gameStyle(GameState state) {
+        return state == GameState.MARKING_MINE ? "MARKING" : "PLAYING";
     }
     
     @Model(className = "Row", properties = {
@@ -55,17 +59,6 @@
         @Property(name = "mine", type = boolean.class)
     })
     static class SquareModel {
-        @ComputedProperty static String html(SquareType state) {
-            if (state == null) return "&nbsp;";
-            switch (state) {
-                case EXPLOSION: return "&#x2717;";
-                case UNKNOWN: return "&nbsp;";
-                case DISCOVERED: return "&#x2714;";  
-                case N_0: return "&nbsp;";
-            }
-            return "&#x278" + (state.ordinal() - 1);
-        }
-        
         @ComputedProperty static String style(SquareType state) {
             return state == null ? null : state.toString();
         }
@@ -73,7 +66,7 @@
     
     enum SquareType {
         N_0, N_1, N_2, N_3, N_4, N_5, N_6, N_7, N_8,
-        UNKNOWN, EXPLOSION, DISCOVERED;
+        UNKNOWN, EXPLOSION, DISCOVERED, MARKED;
         
         final boolean isVisible() {
             return name().startsWith("N_");
@@ -95,6 +88,10 @@
         return state != null;
     }
     
+    @ComputedProperty static boolean gameInProgress(GameState state) {
+        return state == GameState.IN_PROGRESS;
+    }
+    
     @Function static void showHelp(Mines model) {
         model.setState(null);
     }
@@ -108,6 +105,13 @@
     
     @Function static void giveUp(Mines model) {
         showAllBombs(model, SquareType.EXPLOSION);
+        model.setState(GameState.LOST);
+    }
+    
+    @Function static void markMine(Mines model) {
+        if (model.getState() == GameState.IN_PROGRESS) {
+            model.setState(GameState.MARKING_MINE);
+        }
     }
     
     @ModelOperation static void init(Mines model, int width, int height, int mines) {
@@ -193,6 +197,8 @@
         if (!emptyHidden) {
             model.setState(GameState.WON);
             showAllBombs(model, SquareType.DISCOVERED);
+            AudioClip applause = AudioClip.create("applause.mp3");
+            applause.play();
         }
     }
     
@@ -231,28 +237,149 @@
         }
     }
     
-    private static AudioClip TOUCH;
     @Function static void click(Mines model, Square data) {
+        if (model.getState() == GameState.MARKING_MINE) {
+            if (data.getState() == SquareType.UNKNOWN) {
+                data.setState(SquareType.MARKED);
+                if (allMarked(model)) {
+                    model.setState(GameState.WON);
+                    return;
+                }
+            }
+            model.setState(GameState.IN_PROGRESS);
+            return;
+        }
         if (model.getState() != GameState.IN_PROGRESS) {
             return;
         }
-        
-        switch (data.getState()) {
-            case UNKNOWN: 
-                if (data.isMine()) {
-                    showAllBombs(model, SquareType.EXPLOSION);
-                    model.setState(GameState.LOST);
-                } else {
-                    if (TOUCH == null) {
-                        TOUCH = AudioClip.create("move.mp3");
-                    }
-                    TOUCH.play();
-                    expandKnown(model, data);
-                    model.computeMines();
+        if (data.getState() == SquareType.MARKED) {
+            data.setState(SquareType.UNKNOWN);
+            if (allMarked(model)) {
+                model.setState(GameState.WON);
+            }
+            return;
+        }
+        if (data.getState() != SquareType.UNKNOWN) {
+            return;
+        }
+        if (data.isMine()) {
+            Square fair = atLeastOnePlaceWhereBombCantBe(model);
+            if (fair == null) {
+                if (placeBombElseWhere(model, data)) {
+                    cleanedUp(model, data);
+                    return;
                 }
-            break;
+            }
+            explosion(model);
+        } else {
+            Square takeFrom = tryStealBomb(model, data);
+            if (takeFrom != null) {
+                final Square fair = atLeastOnePlaceWhereBombCantBe(model);
+                if (fair != null) {
+                    takeFrom.setMine(false);
+                    data.setMine(true);
+                    explosion(model);
+                    return;
+                }
+            }
+            cleanedUp(model, data);
         }
     }
+
+    private static void cleanedUp(Mines model, Square data) {
+        AudioClip touch = AudioClip.create("move.mp3");
+        touch.play();
+        expandKnown(model, data);
+        model.computeMines();
+    }
+
+    private static void explosion(Mines model) {
+        showAllBombs(model, SquareType.EXPLOSION);
+        model.setState(GameState.LOST);
+        AudioClip oops = AudioClip.create("oops.mp3");
+        oops.play();
+    }
+    
+    private static Square tryStealBomb(Mines model, Square data) {
+        data.setMine(true);
+        final List<Row> rows = model.getRows();
+        for (int y = 0; y < rows.size(); y++) {
+            final List<Square> columns = rows.get(y).getColumns();
+            for (int x = 0; x < columns.size(); x++) {
+                Square sq = columns.get(x);
+                if (sq == data) {
+                    continue;
+                }
+                if (sq.isMine()) {
+                    sq.setMine(false);
+                    final boolean ok = isConsistent(model);
+                    sq.setMine(true);
+                    if (ok) {
+                        data.setMine(false);
+                        return sq;
+                    }
+                }
+            }
+        }
+        data.setMine(false);        
+        return null;
+    }
+    
+    private static Square atLeastOnePlaceWhereBombCantBe(Mines model) {
+        final List<Row> rows = model.getRows();
+        Square cantBe = null;
+        int discovered = 0;
+        for (int y = 0; y < rows.size(); y++) {
+            final List<Square> columns = rows.get(y).getColumns();
+            for (int x = 0; x < columns.size(); x++) {
+                Square sq = columns.get(x);
+                if (sq.getState() == SquareType.UNKNOWN) {
+                    if (!sq.isMine()) {
+                        if (tryStealBomb(model, sq) == null) {
+                            cantBe = sq;
+                        }
+                    }
+                } else {
+                    discovered++;
+                }
+            }
+        }
+        
+        if (discovered > 5) {
+            return cantBe;
+        }
+        
+        return null;
+    }
+    
+    private static boolean placeBombElseWhere(Mines model, Square moveBomb) {
+        List<Square> ok = new ArrayList<Square>();
+        moveBomb.setMine(false);
+        final List<Row> rows = model.getRows();
+        for (int y = 0; y < rows.size(); y++) {
+            final List<Square> columns = rows.get(y).getColumns();
+            for (int x = 0; x < columns.size(); x++) {
+                Square sq = columns.get(x);
+                if (sq == moveBomb || sq.isMine() || sq.getState().isVisible()) {
+                    continue;
+                }
+                sq.setMine(true);
+                if (isConsistent(model)) {
+                    ok.add(sq);
+                }
+                sq.setMine(false);
+            }
+        }
+        if (ok.isEmpty()) {
+            moveBomb.setMine(true);
+            return false;
+        } else {
+            int r = new Random().nextInt(ok.size());
+            ok.get(r).setMine(true);
+            return true;
+        }
+    }
+    
     private static void expandKnown(Mines model, Square data) {
         final List<Row> rows = model.getRows();
         for (int y = 0; y < rows.size(); y++) {
@@ -276,15 +403,7 @@
         }
         final Square sq = columns.get(x);
         if (sq.getState() == SquareType.UNKNOWN) {
-            int around = 
-                minesAt(model, x - 1, y - 1) +
-                minesAt(model, x - 1, y) +
-                minesAt(model, x - 1, y + 1) +
-                minesAt(model, x , y - 1) +
-                minesAt(model, x, y + 1) +
-                minesAt(model, x + 1, y - 1) +
-                minesAt(model, x + 1, y) +
-                minesAt(model, x + 1, y + 1);
+            int around = around(model, x, y);
             final SquareType t = SquareType.valueOf("N_" + around);
             sq.setState(t);
             if (t == SquareType.N_0) {
@@ -299,6 +418,18 @@
             }
         }
     }
+
+    private static int around(Mines model, int x, int y) {
+        return 
+            minesAt(model, x - 1, y - 1) +
+            minesAt(model, x - 1, y) +
+            minesAt(model, x - 1, y + 1) +
+            minesAt(model, x , y - 1) +
+            minesAt(model, x, y + 1) +
+            minesAt(model, x + 1, y - 1) +
+            minesAt(model, x + 1, y) +
+            minesAt(model, x + 1, y + 1);
+    }
     
     private static int minesAt(Mines model, int x, int y) {
         if (y < 0 || y >= model.getRows().size()) {
@@ -312,4 +443,48 @@
         return sq.isMine() ? 1 : 0;
     }
     
+    private static boolean isConsistent(Mines m) {
+        for (int row = 0; row < m.getRows().size(); row++) {
+            Row r = m.getRows().get(row);
+            for (int col = 0; col < r.getColumns().size(); col++) {
+                Square sq = r.getColumns().get(col);
+                if (sq.getState().isVisible()) {
+                    int around = around(m, col, row);
+                    if (around != sq.getState().ordinal()) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+    
+    private static boolean allMarked(Mines m) {
+        for (Row r : m.getRows()) {
+            for (Square sq : r.getColumns()) {
+                if (sq.isMine() == (sq.getState() != SquareType.MARKED)) {
+                    return false;
+                }
+            }
+        }
+        for (Row r : m.getRows()) {
+            for (Square sq : r.getColumns()) {
+                if (sq.isMine()) {
+                    sq.setState(SquareType.DISCOVERED);
+                } else {
+                    sq.setState(SquareType.N_0);
+                }
+            }
+        }
+        computeMines(m);
+        return true;
+    }
+
+    /**
+     * Called when page is ready
+     */
+    public static void main(String... args) throws Exception {
+        Mines m = new Mines();
+        m.applyBindings();
+    }
 }
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/resources/org/apidesign/demo/minesweeper/index.html
--- a/minesweeper/src/main/resources/org/apidesign/demo/minesweeper/index.html	Fri Mar 21 15:02:25 2014 +0100
+++ b/minesweeper/src/main/resources/org/apidesign/demo/minesweeper/index.html	Mon Sep 08 10:11:50 2014 +0200
@@ -1,3 +1,28 @@
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
 <html>
     <head>
         <title>Dummy Page</title>
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/webapp/pages/DukeSweeper.png
Binary file minesweeper/src/main/webapp/pages/DukeSweeper.png has changed
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/webapp/pages/android_logo.jpg
Binary file minesweeper/src/main/webapp/pages/android_logo.jpg has changed
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/webapp/pages/applause.mp3
Binary file minesweeper/src/main/webapp/pages/applause.mp3 has changed
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/webapp/pages/index.html
--- a/minesweeper/src/main/webapp/pages/index.html	Fri Mar 21 15:02:25 2014 +0100
+++ b/minesweeper/src/main/webapp/pages/index.html	Mon Sep 08 10:11:50 2014 +0200
@@ -26,14 +26,14 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <title>Minesweeper</title>
+        <title>Fair Minesweeper</title>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
         <link href="bootstrap.css" rel="stylesheet">
         <link href="bootstrap-responsive.css" rel="stylesheet">
         <link href="mines.css" rel="stylesheet">
         <!-- Target tablets -->
         <link href="mines-tablet-large.css" 
-              media="(min-width:640px) and (max-width:780px), (min-height:660px) and (max-height:830px)" 
+              media="(min-width:640px), (min-height:660px)" 
               rel="stylesheet" />
         <link href="mines-tablet-small.css" 
               media="(min-width:510px) and (max-width:640px), (min-height:520px) and (max-height:660px)" 
@@ -43,42 +43,51 @@
               media="(min-width:410px) and (max-width:510px), (min-height:400px) and (max-height:520px)" 
               rel="stylesheet" />
         <link href="mines-phone-small.css" 
-              media="(min-width:250px) and (max-width:410px), (min-height:250px) and (max-height:400px)" 
+              media="(min-width:300px) and (max-width:410px), (min-height:300px) and (max-height:400px)" 
               rel="stylesheet" />
         <link href="mines-phone-smaller.css" 
-              media="(max-width:250px), (max-height:250px)" 
+              media="(max-width:300px), (max-height:300px)" 
               rel="stylesheet" />
     </head>
     <body>
         <div class="navbar">
             <div class="navbar-inner">
-                <a id="apptitle" class="brand" href="#" data-bind="click: showHelp">Minesweeper</a>
+                <a id="apptitle" class="brand" href="#" data-bind="click: showHelp">
+                    <img height="20" width="20" src="DukeSweeper.png">
+                    <span class="hidden-phone">Minesweeper</span>
+                </a>
                 <button class="btn btn-default navbar-btn" disabled="true" data-bind="disable: false, click: normalGame">
                     <span>&#x21bb;</span>
-                    <span class="hidden-phone">New Game!</span>
+                    <span class="info-text">New!</span>
                 </button>
-                <button class="btn btn-default navbar-btn" disabled="true" data-bind="disable: !fieldShowing(), click: giveUp ">
+                <button class="hidden-phone btn btn-default navbar-btn" disabled="true" data-bind="disable: !gameInProgress(), click: giveUp ">
                     <span>&#x2717;</span>
-                    <span class="hidden-phone">Show Mines!</span>
+                    <span>Show Mines!</span>
+                </button>
+                <button class="btn btn-default navbar-btn" disabled="true" data-bind="disable: !gameInProgress(), click: markMine">
+                    <span>&#x26A0;</span>
+                    <span class="info-text">Mark Mine!</span>
                 </button>
             </div>
         </div>
-        
+
 
         <script type="text/html" id="field">
-            <table class="field">
+          <center>
+              <table class="field" data-bind="css: gameStyle">
                 <tbody>
                     <!-- ko foreach: rows -->
                     <tr>
                         <!-- ko foreach: columns -->
                         <td data-bind="css: style, click: $parents[1].click" >
-                            <div data-bind='html: html'></div>
+                            <div></div>
                         </td>
                         <!-- /ko -->
                     </tr>
                     <!-- /ko -->
                 </tbody>
             </table>
+          </center>
         </script>
 
         <div data-bind="template: { name : 'field', if: fieldShowing }"></div>
@@ -102,17 +111,18 @@
         </div>
 
     <div class="container" data-bind="visible: !fieldShowing()">
-      <div class="row">
+      <div>
         <div class="col-md-4">
           <h2>Minesweeper</h2>
           <p>
-              At the end this is a <em>minesweeper</em>
-              game and you can of course play it. Discover
-              all fields that don't contain a mine. 
-              Touch a field to find out if there is
-              a mine or not. A number on a field indicates
-              how many mines is in the eight surrounding 
-              fields.
+              Discover ten square fields that contain a mine and
+              mark them with a &#x26a0; sign.
+              Touch a square to find out if there is
+              a mine or not and
+              how many mines are in the eight surrounding 
+              ones. Avoid random play, the game 
+              recognizes guessing and can re-arrange
+              the mines. This game is <b>fair</b>!
           </p>
           <p><a class="btn btn-default" href="#" data-bind="click: normalGame"role="button">Play &raquo;</a></p>
         </div>
@@ -126,7 +136,7 @@
               our documentation.
           </p>
           <p><a class="btn btn-default"
-                target="_blank" href="http://bits.netbeans.org/html4j/0.7.5/"
+                target="_blank" href="http://bits.netbeans.org/html+java/"
                 role="button">Read more &raquo;</a></p>
        </div>
         <div class="col-md-4">
@@ -135,20 +145,100 @@
               While primarily this technology runs on a desktop
               or as a table or phone application, it is possible
               to execute the same unchanged code in a browser 
-              as well. To do so, one needs a <strong>bck2brwsr</strong>
+              as well. To do so, one needs a 
+              <a href="http://bck2brwsr.apidesign.org">bck2brwsr</a>
               virtual machine.
           </p>
           <p><a class="btn btn-default"
-                target="_blank" href="http://bck2brwsr.apidesign.org"
-                role="button">Learn more &raquo;</a></p>
+                target="_blank" href="http://xelfi.cz/minesweeper/bck2brwsr/"
+                role="button">Try it &raquo;</a></p>
        </div>
+      </div>
     </div>
-        
+<div class="container" data-bind="visible: !fieldShowing()">
+  <div class="col-sm-6 col-md-4">
+    <div class="thumbnail">
+        <img src="android_logo.jpg" width="120" height="120" alt="Android">
+      <div class="caption">
+        <h3>DlvkBrwsr</h3>
+        <p>
+            This application has been packaged to run on your Android phone
+            and is available on Google Play! In this mode it
+            uses Dalvik virtual machine to execute Java code natively.
+            It uses Android's WebView to display the UI and execute
+            generated JavaScript. Both these components are
+            bound together via <a href="http://wiki.apidesign.org/wiki/DlvkBrwsr">
+            DlvkBrwsr</a>.
+        </p>
+        <p>
+            <a href="https://play.google.com/store/apps/details?id=org.apidesign.demo.minesweeper"
+               target="_blank"
+               class="btn btn-primary" role="button"
+               >Install &raquo;</a> 
+        </p>
+      </div>
+    </div>
+  </div>
+  <div class="col-sm-6 col-md-4">
+    <div class="thumbnail">
+        <img src="ios_logo.jpg" width="120" height="120" alt="Android">
+      <div class="caption">
+        <h3>iBrwsr</h3>
+        <p>
+            This application has been packaged to run on your iPhone
+            or iPad and made available on AppStore.
+            In this mode it
+            uses <a target="_blank" href="http://www.robovm.org">RoboVM</a> 
+            virtual machine to execute Java code natively.
+            It uses iOS WebView to display the UI and execute
+            generated JavaScript. Both these components are
+            bound together via <a target="_blank" 
+            href="http://wiki.apidesign.org/wiki/IBrwsr">
+            iBrwsr</a> library.
+        </p>
+        <p>
+            <a href="https://itunes.apple.com/us/app/fair-minesweeper/id903688146"
+               target="_blank"
+               class="btn btn-primary" role="button"
+               >Install &raquo;</a> 
+        </p>
+      </div>
+    </div>
+  </div>
+  <div class="col-sm-6 col-md-4">
+    <div class="thumbnail">
+        <img src="netbeans_logo.jpg" width="120" height="120" alt="Android">
+      <div class="caption">
+        <h3>Develop Own App!</h3>
+        <p>
+            One can package this application as a 
+            <a href="http://plugins.netbeans.org/plugin/53864/"
+               target="_blank"
+            >plugin for NetBeans</a> or
+            use <a href="http://www.netbeans.org" target="_blank">
+            NetBeans</a> IDE to create
+            application like this yourself. Enjoy the
+            power of <em>HTML</em> and <em>Java</em>.
+            Write your applications once and deploy and display 
+            them on any device!
+        </p>
+        <p>
+            <a href="http://wiki.apidesign.org/wiki/DukeScriptInNetBeans"
+               target="_blank"
+               class="btn btn-primary" role="button"
+               >Develop &raquo;</a> 
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
+        <!-- boot bck2brwsr -->
         <script type="text/javascript" src="bck2brwsr.js"></script>
         <script>
-            var vm = bck2brwsr('${project.build.finalName}.jar');
-            vm.loadClass('org.apidesign.demo.minesweeper.MainBrwsr');
+            var vm = bck2brwsr('minesweeper.js');
+            var c = vm.loadClass('org.apidesign.demo.minesweeper.MinesModel');
+            c.invoke('main');
         </script>
-        
+
     </body>
 </html>
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/webapp/pages/index_cs.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/minesweeper/src/main/webapp/pages/index_cs.html	Mon Sep 08 10:11:50 2014 +0200
@@ -0,0 +1,247 @@
+<!--
+
+    The MIT License (MIT)
+
+    Copyright (C) 2013 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
+-->
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Férové miny</title>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <link href="bootstrap.css" rel="stylesheet">
+        <link href="bootstrap-responsive.css" rel="stylesheet">
+        <link href="mines.css" rel="stylesheet">
+        <!-- Target tablets -->
+        <link href="mines-tablet-large.css" 
+              media="(min-width:640px), (min-height:660px)" 
+              rel="stylesheet" />
+        <link href="mines-tablet-small.css" 
+              media="(min-width:510px) and (max-width:640px), (min-height:520px) and (max-height:660px)" 
+              rel="stylesheet" />
+        <!-- Target phones -->
+        <link href="mines-phone-large.css" 
+              media="(min-width:410px) and (max-width:510px), (min-height:400px) and (max-height:520px)" 
+              rel="stylesheet" />
+        <link href="mines-phone-small.css" 
+              media="(min-width:300px) and (max-width:410px), (min-height:300px) and (max-height:400px)" 
+              rel="stylesheet" />
+        <link href="mines-phone-smaller.css" 
+              media="(max-width:300px), (max-height:300px)" 
+              rel="stylesheet" />
+    </head>
+    <body>
+        <div class="navbar">
+            <div class="navbar-inner">
+                <a id="apptitle" class="brand" href="#" data-bind="click: showHelp">
+                    <img height="20" width="20" src="DukeSweeper.png">
+                    <span class="hidden-phone">Miny</span>
+                </a>
+                <button class="btn btn-default navbar-btn" disabled="true" data-bind="disable: false, click: normalGame">
+                    <span>&#x21bb;</span>
+                    <span class="info-text">Hra</span>
+                </button>
+                <button class="hidden-phone btn btn-default navbar-btn" disabled="true" data-bind="disable: !gameInProgress(), click: giveUp ">
+                    <span>&#x2717;</span>
+                    <span>Vzdát</span>
+                </button>
+                <button class="btn btn-default navbar-btn" disabled="true" data-bind="disable: !gameInProgress(), click: markMine">
+                    <span>&#x26A0;</span>
+                    <span class="info-text">Označkovat</span>
+                </button>
+            </div>
+        </div>
+
+
+        <script type="text/html" id="field">
+          <center>
+              <table class="field" data-bind="css: gameStyle">
+                <tbody>
+                    <!-- ko foreach: rows -->
+                    <tr>
+                        <!-- ko foreach: columns -->
+                        <td data-bind="css: style, click: $parents[1].click" >
+                            <div></div>
+                        </td>
+                        <!-- /ko -->
+                    </tr>
+                    <!-- /ko -->
+                </tbody>
+            </table>
+          </center>
+        </script>
+
+        <div data-bind="template: { name : 'field', if: fieldShowing }"></div>
+        
+        <div class="jumbotron control-label" data-bind="visible: !fieldShowing() ">
+            <div class="container">
+                <h1>Ukázka HTML/Java technologie</h1>
+
+                <p>Na první pohled se jedná o staré dobré <em>miny</em>.
+                   Bližší pohled však odhalí revoluční technologii, jež 
+                   umožňuje programovat logiku aplikace v <strong>Javě</strong>
+                   a uživatelské rozhraní definovat v <strong>HTML</strong>.
+                   To vše na jakémkoli zařízení schopném zobrazit moderní 
+                   <strong>HTML5</strong> prohlížeč.
+                </p>
+                <p><a class="btn btn-primary btn-lg" role="button" 
+                      target="_blank" href="http://html.java.net"
+                >Navštívit stránky projektu</a>
+                </p>
+            </div>
+        </div>
+
+    <div class="container" data-bind="visible: !fieldShowing()">
+      <div>
+        <div class="col-md-4">
+          <h2>Miny</h2>
+          <p>
+              Odhalte deset políček jež skrývají miny 
+              a označte je znakem &#x26a0;.
+              Dotykem políčka se zjistí,  
+              zda-li je na něm mina či kolik min se 
+              nachází v sousedních osmi políčkách.
+              Nespoléhejte na náhodu,
+              tato verze min dokáže detekovat 
+              náhodné hádání a v takovém případě přerovnat miny.
+              Tato hra je <b>fér</b>!
+          </p>
+          <p><a class="btn btn-default" href="#" data-bind="click: normalGame"role="button">Hrát &raquo;</a></p>
+        </div>
+        <div class="col-md-4">
+          <h2>Dokumentace</h2>
+          <p>
+              Chcete-li psát aplikace jako je tato
+              (tedy používat <strong>Javu</strong> a <strong>HTML</strong>)
+              můžete se nyní dozvědět něco o knihovnách, které 
+              to umožňují. Následující odkaz Vás zavede
+              stránky s dokumentací.
+          </p>
+          <p><a class="btn btn-default"
+                target="_blank" href="http://bits.netbeans.org/html+java/"
+                role="button">Více &raquo;</a></p>
+       </div>
+        <div class="col-md-4">
+          <h2>Verze pro prohlížeč</h2>
+          <p>
+              Tato technologie je primárně určena pro
+              klasické osobní počítače či pro tablety a telefony. 
+              Přesto je však možné spustit tu samou aplikaci
+              s nezměným kódem v prohlížeči. Je k tomu potřeba
+              implementace <b>Java</b> virtuálního stroje zvaná
+              <a href="http://bck2brwsr.apidesign.org">bck2brwsr</a>.
+          </p>
+          <p><a class="btn btn-default"
+                target="_blank" href="http://xelfi.cz/minesweeper/bck2brwsr/"
+                role="button">Vyzkoušet &raquo;</a></p>
+       </div>
+      </div>
+    </div>
+<div class="container" data-bind="visible: !fieldShowing()">
+  <div class="col-sm-6 col-md-4">
+    <div class="thumbnail">
+        <img src="android_logo.jpg" width="120" height="120" alt="Android">
+      <div class="caption">
+        <h3>DlvkBrwsr</h3>
+        <p>
+            Tato apliace byla přeložena pro Váš telefon se systémem Android
+            a je dostupná na  Google Play! tržišti. V této konfiguraci
+            se používá virtuální stroj Dalvik pro spouštění <b>Java</b> kódu 
+            a Androidí WebView k zobrazení uživatelského rozhraní a 
+            interpretaci generovaného JavaScriptu. Tyto komponenty jsou
+            spojeny dohromady pomocí <a href="http://wiki.apidesign.org/wiki/DlvkBrwsr">
+            DlvkBrwsr</a> technologie.
+        </p>
+        <p>
+            <a href="https://play.google.com/store/apps/details?id=org.apidesign.demo.minesweeper"
+               target="_blank"
+               class="btn btn-primary" role="button"
+               >Instalovat &raquo;</a> 
+        </p>
+      </div>
+    </div>
+  </div>
+  <div class="col-sm-6 col-md-4">
+    <div class="thumbnail">
+        <img src="ios_logo.jpg" width="120" height="120" alt="Android">
+      <div class="caption">
+        <h3>iBrwsr</h3>
+        <p>
+            Tato aplikace byla přeložena a zabalena tak, aby běžela na
+            Vašem iPhonu
+            nebo iPadu a je dostupná na tržišti AppStore.
+            V této konfiguraci se používá
+            virtuální stroj <a target="_blank" href="http://www.robovm.org">RoboVM</a> 
+            pro přeložení <b>Java</b> kódu do nativního formátu.
+            Pro zobrazení a provádění vygenerovaného JavaScriptu
+            se využívá iOS WebView. Obě tyto komponenty jsou spojeny 
+            pomocí <a target="_blank" 
+                href="http://wiki.apidesign.org/wiki/IBrwsr">
+            iBrwsr</a> knihovny.
+        </p>
+        <p>
+            <a href="https://itunes.apple.com/us/app/fair-minesweeper/id903688146"
+               target="_blank"
+               class="btn btn-primary" role="button"
+               >Instalovat &raquo;</a> 
+        </p>
+      </div>
+    </div>
+  </div>
+  <div class="col-sm-6 col-md-4">
+    <div class="thumbnail">
+        <img src="netbeans_logo.jpg" width="120" height="120" alt="Android">
+      <div class="caption">
+        <h3>Vyvíjejte své aplikace!</h3>
+        <p>
+            Tuto aplikace lze zabalit jako 
+            <a href="http://plugins.netbeans.org/plugin/53864/"
+               target="_blank"
+            >rozšíření pro NetBeans</a> a nebo
+            lze použít vývojové prostředí 
+            <a href="http://www.netbeans.org" target="_blank">
+            NetBeans</a> k vytvoření své vlastní aplikace,
+            jež bude využívat synergie 
+            <em>HTML</em> a <em>Javy</em>.
+            Pište své aplikace jednou a zobrazte je na 
+            každém zařízení schopném zobrazit <em>HTML</em>!
+        </p>
+        <p>
+            <a href="http://wiki.apidesign.org/wiki/DukeScriptInNetBeans"
+               target="_blank"
+               class="btn btn-primary" role="button"
+               >Vyvíjejte &raquo;</a> 
+        </p>
+      </div>
+    </div>
+  </div>
+</div>
+        <!-- boot bck2brwsr -->
+        <script type="text/javascript" src="bck2brwsr.js"></script>
+        <script>
+            var vm = bck2brwsr('minesweeper.js');
+            var c = vm.loadClass('org.apidesign.demo.minesweeper.MinesModel');
+            c.invoke('main');
+        </script>
+
+    </body>
+</html>
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/webapp/pages/ios_logo.jpg
Binary file minesweeper/src/main/webapp/pages/ios_logo.jpg has changed
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/webapp/pages/mines-phone-small.css
--- a/minesweeper/src/main/webapp/pages/mines-phone-small.css	Fri Mar 21 15:02:25 2014 +0100
+++ b/minesweeper/src/main/webapp/pages/mines-phone-small.css	Mon Sep 08 10:11:50 2014 +0200
@@ -22,9 +22,9 @@
  * THE SOFTWARE.
  */
 table.field td {
-    padding: 4px;
-    width: 18px;
-    height: 18px;
+    padding: 3px;
+    width: 16px;
+    height: 16px;
     font-size: 1.5em;
 }
 h1 {
@@ -51,3 +51,6 @@
 .col-md-1 {
  width: 100%;
 }
+.info-text {
+    font-size: xx-small;
+}
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/webapp/pages/mines-phone-smaller.css
--- a/minesweeper/src/main/webapp/pages/mines-phone-smaller.css	Fri Mar 21 15:02:25 2014 +0100
+++ b/minesweeper/src/main/webapp/pages/mines-phone-smaller.css	Mon Sep 08 10:11:50 2014 +0200
@@ -22,11 +22,11 @@
  * THE SOFTWARE.
  */
 table.field td {
-    padding: 2px;
-    width: 10px;
-    height: 10px;
+    padding: 3px;
+    width: 13px;
+    height: 13px;
     line-height: 10px;
-    font-size: 0.8em;
+    font-size: 1em;
 }
 h1 {
     font-size: 8px;
@@ -52,3 +52,6 @@
 .col-md-1 {
  width: 100%;
 }
+.info-text {
+    font-size: xx-small;
+}
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/webapp/pages/mines.css
--- a/minesweeper/src/main/webapp/pages/mines.css	Fri Mar 21 15:02:25 2014 +0100
+++ b/minesweeper/src/main/webapp/pages/mines.css	Mon Sep 08 10:11:50 2014 +0200
@@ -33,6 +33,10 @@
     background-color: #fafafa;
 }
 
+table {
+    table-layout: fixed;
+}
+
 table.field {
 }
 table.field td {
@@ -51,8 +55,50 @@
     top: 0;
 }
 
+@-moz-keyframes blinker {  
+    0% { opacity: 0.9; }
+    50% { opacity: 0.1; }
+    100% { opacity: 0.9; }
+}
+
+@-webkit-keyframes blinker {  
+    0% { opacity: 0.9; }
+    50% { opacity: 0.1; }
+    100% { opacity: 0.9; }
+}
+
+@keyframes blinker {  
+    0% { opacity: 0.9; }
+    50% { opacity: 0.1; }
+    100% { opacity: 0.9; }
+} 
+table.MARKING td.UNKNOWN div:before {
+    content: "\0026a0";
+    color: #802420;
+    
+    -webkit-animation-name: blinker;
+    -webkit-animation-duration: 3s;
+    -webkit-animation-timing-function: linear;
+    -webkit-animation-iteration-count: infinite;
+
+    -moz-animation-name: blinker;
+    -moz-animation-duration: 3s;
+    -moz-animation-timing-function: linear;
+    -moz-animation-iteration-count: infinite;
+
+    animation-name: blinker;
+    animation-duration: 3s;
+    animation-timing-function: linear;
+    animation-iteration-count: infinite;
+}
+
 table.field td.UNKNOWN {
     background-color: #D6E4E1;
+    color: #D6E4E1;
+    cursor: pointer;
+}
+table.field td.MARKED {
+    background-color: #D6E4E1;
     cursor: pointer;
 }
 table.field td.EXPLOSION {
@@ -61,6 +107,48 @@
 table.field td.DISCOVERED {
     background-color: #9DB2B1;
 }
+
+table.PLAYING td.UNKNOWN div::after {
+    content: "\0026a0";
+    visibility: hidden;
+}
+table.field td.EXPLOSION div::after {
+    content: "\002717";
+}
+table.field td.DISCOVERED div::after {
+    content: "\002714";
+}
+table.field td.MARKED div::after {
+    content: "\0026a0";
+}
+table.field td.N_0 div::after {
+    content: "\0026a0";
+    visibility: hidden;
+}
+table.field td.N_1 div::after {
+    content: "\002780";
+}
+table.field td.N_2 div::after {
+    content: "\002781";
+}
+table.field td.N_3 div::after {
+    content: "\002782";
+}
+table.field td.N_4 div::after {
+    content: "\002783";
+}
+table.field td.N_5 div::after {
+    content: "\002784";
+}
+table.field td.N_6 div::after {
+    content: "\002785";
+}
+table.field td.N_7 div::after {
+    content: "\002786";
+}
+table.field td.N_8 div::after {
+    content: "\002787";
+}
 .but-orientation {
     margin-top:20px;
 }
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/webapp/pages/netbeans_logo.jpg
Binary file minesweeper/src/main/webapp/pages/netbeans_logo.jpg has changed
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/main/webapp/pages/oops.mp3
Binary file minesweeper/src/main/webapp/pages/oops.mp3 has changed
diff -r 11e5ac27a524 -r 8ea23c9e5008 minesweeper/src/test/java/org/apidesign/demo/minesweeper/MinesModelTest.java
--- a/minesweeper/src/test/java/org/apidesign/demo/minesweeper/MinesModelTest.java	Fri Mar 21 15:02:25 2014 +0100
+++ b/minesweeper/src/test/java/org/apidesign/demo/minesweeper/MinesModelTest.java	Mon Sep 08 10:11:50 2014 +0200
@@ -45,6 +45,64 @@
         assertEquals(cnt, 10, "Ten mines");
     }
     
+    @Test public void clickRemovesMarkedSign() {
+        Mines m = new Mines();
+        m.init(10, 10, 10);
+        
+        final Square sq = m.getRows().get(5).getColumns().get(5);
+        MinesModel.markMine(m);
+        MinesModel.click(m, sq);
+        
+        assertEquals(sq.getState(), SquareType.MARKED, "Changed to marked");
+        
+        MinesModel.click(m, sq);
+        
+        assertEquals(sq.getState(), SquareType.UNKNOWN, "Changed back to unknown");
+    }
+
+    @Test public void gameWonWhenAllMarked() {
+        Mines m = new Mines();
+        m.init(10, 10, 10);
+        
+        for (Row row : m.getRows()) {
+            for (Square sq : row.getColumns()) {
+                if (sq.isMine()) {
+                    MinesModel.markMine(m);
+                    MinesModel.click(m, sq);
+                }
+            }
+        }
+        
+        assertEquals(m.getState(), MinesModel.GameState.WON, "All mines found. You have won!");
+    }
+    
+    @Test public void gameNotWonWhenTooMuchIsMarked() {
+        Mines m = new Mines();
+        m.init(10, 10, 10);
+        
+        Square additional = null;
+        for (Row row : m.getRows()) {
+            for (Square sq : row.getColumns()) {
+                if (sq.isMine()) {
+                    MinesModel.markMine(m);
+                    MinesModel.click(m, sq);
+                } else if (additional == null) {
+                    MinesModel.markMine(m);
+                    MinesModel.click(m, additional = sq);
+                }
+            } 
+        }
+        
+        assertEquals(m.getState(), MinesModel.GameState.IN_PROGRESS, "One additional mine is marked!");
+        
+        // remove the mark
+        MinesModel.click(m, additional);
+        
+        assertEquals(m.getState(), MinesModel.GameState.WON, "All mines found. You have won!");
+        
+        
+    }
+    
     @Test public void bombsSet() {
         Mines m = new Mines();
         m.init(10, 10, 0);
diff -r 11e5ac27a524 -r 8ea23c9e5008 pom.xml
--- a/pom.xml	Fri Mar 21 15:02:25 2014 +0100
+++ b/pom.xml	Mon Sep 08 10:11:50 2014 +0200
@@ -13,8 +13,10 @@
   </parent>  
   <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <net.java.html.version>0.7.6</net.java.html.version>
-      <bck2brwsr.version>0.8.1</bck2brwsr.version>
+      <net.java.html.version>1.0-SNAPSHOT</net.java.html.version>
+      <nb.html.version>0.8.3</nb.html.version>
+      <bck2brwsr.version>0.9</bck2brwsr.version>
+      <teavm.version>0.1</teavm.version>
       <license>COPYING</license>
   </properties>
   <modules>