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

Conflicts:
	index.html
	version.num
diff --git a/version.num b/version.num
index dec4c59..7296f25 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-104
\ No newline at end of file
+136