merge error in analysisService.js
keytype error
fixed bugs appearing in merge (still testing)
corrected merge error and improved css for maptool widget
fixed bug in scatterplot widget X options and improved css
cleaned up css for barchart
fixed the bug of color column (moved the controller) and set the
column
cleaned up Service,changed writeSessionState param handling
added headings
fixed the bug for keyType according to new queryObject format
corrected the color column for state preservation btwn tabs
fixed the empty datatable tool widget bug
minor clean ups, typos in datatable widget
map tool keytype error bug
removing json simple from project settings
removing servlet -api jar from project
removing jars from WeaveAnalystServices
resolve conflict with merge, organize imports