Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate

Conflicts:
	version.num
diff --git a/version.num b/version.num
index 83249da..3aedf24e 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-784
\ No newline at end of file
+784