Merge branch 'hotfix-2.1.6' into develop
Merge branch 'hotfix-2.1.7' into develop
Terms and conditions separated from the template.

If a file terms exists in app/View/Users, the terms are included.
If not, the default message is included to inform the admin. This
avoids to overwrite local terms when updating MISP code.
Attribute http-method added - issue #161 fixed

The attribute HTTP method added. By default, the values
must match the known HTTP method from RFC2616, RFC2518,
RFC3253, RFC3648, RFC3744, RFC5789, RFC5323. The method
is case sensitive.
Vulnerability url is now configurable (Fix #153).

A global configuration CyDefSig.cveurl added to specify the URL
where to reference a CVE/NVD number. CyDefSig.cveurl is optional
and if not existing fallbacks to the original google.com URL.
Merge branch 'hotfix-2.1.9' into develop
Merge branch 'hotfix-2.1.10' into develop
Merge branch 'hotfix-2.1.11' into develop
Merge branch 'hotfix-2.1.11' into develop
Merge branch 'hotfix-2.1.11' into develop
Merge branch 'hotfix-2.1.8' into develop
Merge branch 'hotfix-2.1.8' into develop
Merge branch 'hotfix-2.1.12' into develop
Merge branch 'hotfix-2.1.12' into develop
Merge branch 'hotfix-2.1.12' into develop
Merge branch 'hotfix-2.1.12' into develop
Merge branch 'hotfix-2.1.13' into develop
Merge branch 'hotfix-2.1.14' into develop
Merge branch 'hotfix-2.1.14' into develop
Merge branch 'hotfix-2.1.15' into develop