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

Conflicts:
	version.num
diff --git a/version.num b/version.num
index 6f6edae..fb814da 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-1307
\ No newline at end of file
+1307