Merge branch 'master' into latest

Conflicts:
	index.html
	version.num
diff --git a/version.num b/version.num
index f937f7e..0c56bea 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-233
\ No newline at end of file
+233