Merge branch 'master' into latest

Conflicts:
	index.html
	version.num
diff --git a/version.num b/version.num
index 0aede4a..257e563 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-102
\ No newline at end of file
+102