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

hr/doctype/employee/employee.txt

@@ -2,7 +2,7 @@
  {
   "creation": "2013-03-07 09:04:18", 
   "docstatus": 0, 
-  "modified": "2013-04-12 07:16:42", 
+  "modified": "2013-07-05 11:23:07", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -608,12 +608,6 @@
   "label": "Educational Qualification Details", 
   "options": "Employee Education"
  }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "career_history", 
-  "fieldtype": "Section Break", 
-  "label": "Career History"
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "previous_work_experience", 
@@ -762,7 +756,6 @@
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "match": "", 
   "permlevel": 1, 
   "report": 0, 
   "role": "Employee", 
@@ -791,7 +784,6 @@
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "match": "", 
   "permlevel": 1, 
   "report": 0, 
   "role": "HR User", 
@@ -801,7 +793,6 @@
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "match": "", 
   "permlevel": 1, 
   "report": 0, 
   "role": "HR Manager",