Merge branch 'master' into navupdate

Conflicts:
	version.num
diff --git a/version.num b/version.num
index 8d75cc7..dc19332 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-705
\ No newline at end of file
+705