Merge branch 'master' into edge

Conflicts:
	setup/doctype/backup_manager/backup_dropbox.py

website/doctype/contact_us_settings/contact_us_settings.py

@@ -10,9 +10,9 @@ class DocType:
 	def onload(self):
 		"""load address"""
 		if self.doc.query_options:
-			self.doc.query_options = filter(None, self.doc.query_options.replace(",", "\n").split())
+			self.query_options = filter(None, self.doc.query_options.replace(",", "\n").split())
 		else:
-			self.doc.query_options = ["Sales", "Support", "General"]
+			self.query_options = ["Sales", "Support", "General"]
 		if self.doc.address:
 			self.address = webnotes.bean("Address", self.doc.address).doc
 			

website/templates/pages/contact.html

@@ -19,7 +19,7 @@
 			</div>
 			<div class="clearfix"></div>
 			<p><select class="span6" name="subject">
-				{% for option in obj.doc.query_options %}
+				{% for option in obj.query_options %}
 					<option value="{{ option }}">{{ option }}</option>
 				{% endfor %}
 			</select></p>

website/utils.py

@@ -143,6 +143,7 @@ def prepare_args(page_name):
 				args.update(webnotes.get_method(target)())
 			else:
 				args.obj = webnotes.bean(page_settings_map[page_name]).obj
+
 	else:
 		args = get_doc_fields(page_name)