Merge branch 'develop' of https://github.com/gertvv/addis into develop

* 'develop' of https://github.com/gertvv/addis:
  Update architecture docs
Add preferences to JSON node
Bugfix for dbeta distribution in JSMAA export
Merge branch 'develop' of https://github.com/gertvv/addis into develop

* 'develop' of https://github.com/gertvv/addis:
  Version to 1.16.4-SNAPSHOT
  Update README and HEADER
  Spell correction
Version to 1.16.4
Keys for criteria and alternatives in SMAA export
Release for 1.16.4
Update licence
Hotfix
Merge pull request #84 from joelkuiper/develop

1.16.4 release