Merge branch 'develop'

Author: MengZhang

.gitignore

@@ -239,4 +239,8 @@ src/main/resources/public/plugins/mxgraph/*
 src/main/resources/public/test.html
 src/main/resources/public/test_mxgraph.html
 Data.zip
-/Test/*
+/Test/*
+.Rproj.user
+/Task/*
+/src/main/resources/public/demo/
+config.ini

Data/ICASA/Crop_codes.csv

@@ -23,7 +23,7 @@
 "CRID","CAR","Carrot","Daucus carota","Vegetable","","","C1","Carrot","","C3","Biennial","SD/LD","Y","Root","","N","Seed","","en.wikipedia.org/wiki/Carrot","Vegetables","","","","","",""
 "CRID","CBG","Cabbage","Brassica oleraceae","Vegetable","","","CB","Cabbage","","C3","Annual","","","Leaf","","N","Seed","","en.wikipedia.org/wiki/Cabbage","Vegetables","CRGRO","CRGRO-Cabbage","","","",""
 "CRID","CBY","Cranberry","Vaccinium macrocarpon","Fruit","","","","","","C3","Perennial","","","Fruit","","N","","","","Fruit crops","","","","","",""
-"CRID","CCB","Chinese cabbage","Brassica rapa","Vegetable","","","","","","C3","Annual","LD","Y","Seed","Size","N","Seed","","en.wikipedia.org/wiki/Chinese_cabbage","Vegetables","","","","","",""
+"CRID","CCB","Chinese cabbage","Brassica rapa","Vegetable","","inlcudes napa cabbage and bok choy","C3","","","C3","Annual","LD","Y","Seed","Size","N","Seed","","en.wikipedia.org/wiki/Chinese_cabbage","Vegetables","","","","","",""
 "CRID","CCN","Coconut","Cocos nucifera","Oil seed","","","CC","Coconut","","C3","Perennial","","","Seed","Stage","N","Seed","","en.wikipedia.org/wiki/Coconut","Oil crops","","","","","",""
 "CRID","CEL","Celery","Apium graveolens","Vegetable","","","","","","C3","Annual","SD/LD","Y","Shoot","","N","Seed","","en.wikipedia.org/wiki/Celery","Vegetables","","","","","",""
 "CRID","CFE","Coffee","Coffea spp.","Beverage","","C. arabica, C. rustica","CF","Coffee","","C3","Perennial","","","Fruit","","N","Seed","","en.wikipedia.org/wiki/Coffee","Beverage","","","","","",""
@@ -55,8 +55,10 @@
 "CRID","FLX","Flax","Linum usitatissimum","Fiber","","","FX","","","C3","Annual","","","Stem","","N","Seed","","","Fiber","","","","","",""
 "CRID","FML","Finger millet","Eleusine coracana","Cereal","","","","","","C4","Annual","","","Seed","","N","","","","Cereals","","","","","",""
 "CRID","FRG","Forage (generic)","(various)","Forage","","Unidentified forage crop","G0","","","NA","Perennial","","","Shoot","","N","","","","Forages","","","","","",""
+"CRID","FMZ","Forage maize","Zea mays","Forage","","","MF","","","C4","Annual","","","Shoot","","N","Seed","","en.wikipedia.org/wiki/Maize","","","","","","",""
 "CRID","FSR","Red fescue","Festuca rubra","Turf","Ornamental","Creeping red fescue","FR","","","","Perennial","","","","","","","","https://en.wikipedia.org/wiki/Festuca_rubra","","","","","","",""
 "CRID","FXM","Foxtail millet","Setaria italica","Cereal","","","FM","Foxtailmillet","","C4","Annual","","","Seed","","N","Seed","","","Cereals","","","","","",""
+"CRID","GAR","Garlic","Allium sativum","Vegetable","","","GA","","","C3","Annual","","","Bulb","","N","Bulb","","https://en.wikipedia.org/wiki/Garlic","Vegetables","","","","","",""
 "CRID","GGR","Guinea grass","Megathyrsus maximus","Forage","","Formerly Panicum maximum. In USA, an invasive weed.","GG","","","C4","Perennial","SD","N","Shoot","","N","Seed","","en.wikipedia.org/wiki/Megathyrsus_maximus","Forages","PRFRM","PRFRM-Guineagrass","","","",""
 "CRID","GRV","Grass vegetations","(various)","NA","","","GR","Grassvegetations","","NA","NA","","","NA","","N","NA","","","Various","","","","","",""
 "CRID","GRW","Grass weeds","(various)","NA","","","GW","Weed","","NA","NA","","","NA","","N","NA","","","Various","","","","","",""
@@ -86,7 +88,7 @@
 "CRID","OKR","Okra","Abelmoschus esculentus","Vegetable","","","","","","C3","Annual","","","Fruit","","N","Seed","","","Vegetables","","","","","",""
 "CRID","OLP","Oil palm","Elaeis spp.","Oil seed","","E. guineensis & others","OP","Oilpalm","","C3","Perennial","","","Seed","","N","Transplant","","en.wikipedia.org/wiki/Elaeis","Oil crops","","","","","",""
 "CRID","OLV","Olives","Olea europeae","Oil seed","","","","","","C3","Perennial","","","Seed","","N","","","","Oil crops","","","","","",""
-"CRID","ONI","Onion","Allium cepa","Vegetable","","","ON","Onion","","C3","Biennial","SD, ID, LD","Y","Bulb","","N","Seed","Sets","en.wikipedia.org/wiki/Onion","Vegetables","","","","","",""
+"CRID","ONI","Onion","Allium cepa","Vegetable","","Includes scallion and green onions","ON","Onion","","C3","Biennial","SD, ID, LD","Y","Bulb","","N","Seed","Sets","en.wikipedia.org/wiki/Onion","Vegetables","","","","","",""
 "CRID","OTH","Other","var.","var.","","""Other"" refers to species not listed herein, or a mixture of species.","","","","","","","","","","","","","","","","","","","",""
 "CRID","PAR","Parsnip","Pastinaca sativa","Vegetable","","","","","","C3","","","Y","Root","","N","Seed","","","Vegetables","","","","","",""
 "CRID","PCH","Pak choi","Brassica rapa","Vegetable","","","","","","C3","Annual","","","Seed","","N","Seed","","","Vegetables","","","","","",""
@@ -109,7 +111,7 @@
 "CRID","PSM","Persimmon","Diospyros kaki","Fruit","","","","","","C3","Perennial","","","Fruit","","N","","","","Fruit crops","","","","","",""
 "CRID","PST","Pistachio","Pistacia vera","Nut","","","","","","C3","Perennial","","","Seed","","N","","","","Nut","","","","","",""
 "CRID","QUN","Quinoa","Chenopodium quinoa","Pseudocereal","","","QU","Quinoa","","C3","Annual","","","Seed","","N","Seed","","","Cereals","CRGRO","CROPGRO-Quinoa","","","",""
-"CRID","RAD","Radish","Raphanus sativus","Vegetable","","","","","","C3","Annual","LD","Y","Root","","N","","","","Vegetables","","","","","",""
+"CRID","RAD","Radish","Raphanus sativus","Vegetable","","","RD","","","C3","Annual","LD","Y","Root","","N","","","","Vegetables","","","","","",""
 "CRID","RAP","Rape","Brassica rapa","Oil seed","","","RA","Rape","","C3","Annual","","","Seed","","N","Seed","","","Oil crops","","","","","",""
 "CRID","RCL","Red clover","Trifolium pratense","Forage","","","RC","Redclover","","C3","Perennial","","","Shoot","","Y","Seed","","en.wikipedia.org/wiki/Trifolium_pratense","Forages","","","","","",""
 "CRID","RGA","Annual ryegrass","Festuca perennis","Silage","Turf","Also as Lolium multiflorum","RG","","","C3","Annual","","","Shoot","","N","Seed","","en.wikipedia.org/wiki/Festuca_perennis","Forages","","","","","",""
@@ -130,7 +132,7 @@
 "CRID","STR","Shrubs/trees","(various)","NA","","","ST","Tree","","C3","Perennial","","","","","N","","","","Various","","","","","",""
 "CRID","STV","Stevia","Stevia rebaudiana","Artificial sweetener","","","SV","","","","Perennial","","","Leaves","","N","Seeds","Cuttings","en.wikipedia.org/wiki/Stevia_rebaudiana","Various","","","","","",""
 "CRID","SUC","Sugarcane","Saccharum spp. ","Sugar","","","SC","Sugar","","C4","Perennial","","","Stem","","N","Stem cutting","","","Sugar/Energy","SCCAN","CANEGRO-Sugarcane","SCCSP","CASUPRO-Sugarcane","SCSAM","SAMUCA-Sugarcane"
-
+"","","","","","","","","","","","","","","","","","","","","","","","","","",""
 "CRID","SUN","Sunflower","Helianthus annuus ","Oil seed","","","SU","Sunflower","","C3","Annual","","","Seed","","N","Seed","","","Oil crops","CRGRO","CROPGRO-Sunflower","SUOIL","OILCROP-Sunflower","",""
 "CRID","SWC","Sweet corn","Zea mays","Vegetable","","","SW","","","C4","Annual","","","Seed","","N","Seed","","","Vegetables","SWCER","CERES-Sweetcorn","","","",""
 "CRID","SWG","Switch grass","Panicum virgatum","Bioenergy","Forage","","SI","Switchgrass","","C3","Perennial","","","Seed","","N","Seed","","en.wikipedia.org/wiki/Panicum_virgatum","Sugar/Energy","","","","","",""
@@ -161,10 +163,10 @@
 "CRID","ZZ2","Legume-unknown or mixture","NA","Legume","","","","","","","","","","","","","","","","","","","","","",""
 "CRID","ZZ3","Grass-unknown or mixture","NA","NA","","","","","","","","","","","","","","","","","","","","","",""
 "CRID","ZZ4","Cover crop-unknown or mixture","NA","Cover crop","","","","","","","","","","","","","","","","","","","","","",""
-"","","","","","","","","","","","","","","","","","","","","","","","","","",""
-"","","","","","","","","","","","","","","","","","","","","","","","","","",""
-"","","","","","","","","","","","","","","","","","","","","","","","","","",""
-"","","","","","","","","","","","","","","","","","","","","","","","","","",""
+"","","","","","","","FC","","","","","","","","","","","","","","","","","","",""
+"","","","","","","","SQ","","","","","","","","","","","","","","","","","","",""
+"","","","","","","","SN","","","","","","","","","","","","","","","","","","",""
+"","","","","","","","GS","","","","","","","","","","","","","","","","","","",""
 "","","","","","","","","","","","","","","","","","","","","","","","","","",""
 "","","","","","","","","","","","","","","","","","","","","","","","","","",""
 "","","","","","","","","","","","","","","","","","","","","","","","","","",""