Update composer dependencies

DIAM-1862 fix wrong branch key in email notification

Merge branch 'master' into 2.0

DIAM-1832 add check for non-existent header

updated version number

change travis config

add route to whitelist

DIAM-991 Fixed dependencies