# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1366749009 -7200
# Node ID a60a450b8f3bbae74cb57646f3c65f463882599f
# Parent  f978d70a9e639576a1e78ef8c3c5e9e00b335480# Parent  8786006c553ce05fa0c6c30df451119f9fa1b93f
Merge with 8786006c553ce05fa0c6c30df451119f9fa1b93f

diff -r 8786006c553c -r a60a450b8f3b .classpath
--- a/.classpath	Tue Apr 23 21:57:58 2013 +0200
+++ b/.classpath	Tue Apr 23 22:30:09 2013 +0200
@@ -259,8 +259,20 @@
 			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/javax/validation/validation-api/1.1.0.CR2/validation-api-1.1.0.CR2.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/fasterxml/uuid/java-uuid-generator/3.1.3/java-uuid-generator-3.1.3.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-json/1.17.1/jersey-json-1.17.1.jar"/>
+	<classpathentry kind="var" path="M2_REPO/javax/validation/validation-api/1.1.0.CR2/validation-api-1.1.0.CR2.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="M2_REPO/com/fasterxml/uuid/java-uuid-generator/3.1.3/java-uuid-generator-3.1.3.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="M2_REPO/com/sun/jersey/jersey-json/1.17.1/jersey-json-1.17.1.jar">
+		<attributes>
+			<attribute name="org.eclipse.jst.component.nondependency" value=""/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="server/target/classes"/>
 </classpath>
diff -r 8786006c553c -r a60a450b8f3b .hgtags
--- a/.hgtags	Tue Apr 23 21:57:58 2013 +0200
+++ b/.hgtags	Tue Apr 23 22:30:09 2013 +0200
@@ -14,3 +14,4 @@
 2b141054edeca0ce606406faec4fb43e56c9a7eb V00.06
 1ef851402261a609204af81685d350cb958d6baa V00.06.01
 5b62100b8562a7557f78d1f7663361a37cc5c12b V00.06.02
+27c89a5c537b0d660448422d11cb73f402c5514d V00.06.03
diff -r 8786006c553c -r a60a450b8f3b client/css/renkan.css
diff -r 8786006c553c -r a60a450b8f3b client/js/defaults.js
diff -r 8786006c553c -r a60a450b8f3b client/js/main.js
diff -r 8786006c553c -r a60a450b8f3b client/js/paper-renderer.js