Merged updates from Paul and Kaijian
Bugfix
Merge branch 'master' of https://github.com/IKCAP/turbosoft.git

Conflicts:
	reasoner/src/main/java/org/earthcube/geosoft/software/api/impl/kb/SoftwareKB.java