Merge branch 'stable' into latest

Conflicts:
	erpnext/stock/doctype/item/item.txt
	index.html
	version.num
diff --git a/version.num b/version.num
index cfd6ea5..3d9988a 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-335
\ No newline at end of file
+335