Fixed conflict

config.json

@@ -1,6 +1,6 @@
 {
  "base_template": "lib/website/templates/base.html", 
- "framework_version": "3.4.2", 
+ "framework_version": "3.5.0", 
  "modules": {
   "Calendar": {
    "color": "#2980b9", 

core/doctype/custom_field/custom_field.txt

@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:01", 
   "docstatus": 0, 
-  "modified": "2014-01-09 18:13:31", 
+  "modified": "2014-01-10 15:04:04", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -61,6 +61,7 @@
   "fieldname": "dt", 
   "fieldtype": "Link", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Document", 
   "no_copy": 0, 
   "oldfieldname": "dt", 
@@ -93,6 +94,7 @@
   "fieldname": "fieldtype", 
   "fieldtype": "Select", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Field Type", 
   "no_copy": 0, 
   "oldfieldname": "fieldtype", 
@@ -164,6 +166,7 @@
   "doctype": "DocField", 
   "fieldname": "fieldname", 
   "fieldtype": "Data", 
+  "in_list_view": 1, 
   "label": "Fieldname", 
   "no_copy": 1, 
   "oldfieldname": "fieldname", 

public/js/wn/form/control.js

@@ -446,7 +446,8 @@ wn.ui.form.ControlCheck = wn.ui.form.ControlData.extend({
 		this.$wrapper = $('<div class="form-group row" style="margin: 0px;">\
 		<div class="col-md-offset-4 col-md-8">\
 			<div class="checkbox" style="margin: 5px 0px">\
-				<label class="input-area">\
+				<label>\
+					<span class="input-area"></span>\
 					<span class="disp-area" style="display:none;"></span>\
 					<span class="label-area small text-muted"></span>\
 				</label>\

requirements.txt

@@ -7,7 +7,7 @@ httplib2
 jinja2
 markdown2
 markupsafe
-mysql-python
+mysql-python==1.2.4
 pygeoip
 python-dateutil
 python-memcached