First commit
Merge branch 'master' of https://github.com/gkapi/SPDXCompatTools

Conflicts:
	src/ac/ucy/cs/spdx/common/LicenseConsts.java
Merge branch 'master' of https://github.com/gkapi/SPDXCompatTools

Conflicts:
	src/ac/ucy/cs/spdx/common/LicenseConsts.java