fix version number master
Merge branch 'hotfix-2.1.14'
Merge branch 'master' of https://github.com/MISP/MISP
Merge branch 'hotfix-2.1.14'
Fix to a typo causing exports to fail
Merge branch 'hotfix-2.1.15' into develop