Merge pull request #80 from InformationIntegrationGroup/development

Merging development into master
v2.000
Merge pull request #81 from InformationIntegrationGroup/development

Speed up for RDF generation and bug fix
Update README.md
Update README.md
Update README.md
Update README.md
Merge branch 'development'

Conflicts:
	src/main/webapp/version.jsp