Merge branch 'development'
some minor changes in my research code
add row
bug fixed
untracked files
Merge pull request #57 from ukby1234/frank-dev

Frank dev
Merge branch 'master' into development
Merge branch 'development' of https://github.com/InformationIntegrationGroup/Web-Karma into development
Comment out Frank's AddRow command
Do not write to history in manualAlignment mode
Added another test case for KDD, fix for not writing history in manual mode
Changed version to 1.205
Handle the Schema for SQLServer
bug fix
Fix for WK-70: Offline RDF generation throws exception for for SAAM WebConstituents
refractor
Merge pull request #58 from ukby1234/frank-dev

refractor json import code
Merge branch 'development' into frank-add-values
Merge remote-tracking branch 'origin/frank-add-values' into gui_improvements

Conflicts:
	src/main/webapp/index.jsp
	src/main/webapp/js/tableWorkspace.js
Added JS for Add Row Command