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

Conflicts:
	erpnext/website/doctype/style_settings/style_settings.txt
	version.num
diff --git a/version.num b/version.num
index 560b9d8..2800f1b 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-1401
\ No newline at end of file
+1460