Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui

erpnext/hooks.py

@@ -21,11 +21,16 @@ web_include_js = "assets/js/erpnext-web.min.js"
 web_include_css = "assets/css/erpnext-web.css"
 
 doctype_js = {
+	"Address": "public/js/address.js",
 	"Communication": "public/js/communication.js",
 	"Event": "public/js/event.js",
 	"Newsletter": "public/js/newsletter.js"
 }
 
+override_doctype_class = {
+	'Address': 'erpnext.accounts.custom.address.ERPNextAddress'
+}
+
 welcome_email = "erpnext.setup.utils.welcome_email"
 
 # setup wizard
@@ -561,4 +566,4 @@ global_search_doctypes = {
 		{'doctype': 'Hotel Room Package', 'index': 3},
 		{'doctype': 'Hotel Room Type', 'index': 4}
 	]
-}
+}