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

Conflicts:
	version.num
diff --git a/version.num b/version.num
index 8f7277e..6aedc8e 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-571
\ No newline at end of file
+571