Merge branch 'pr/eikehartmann/205'

Merge branch 'master' into pr/eikehartmann/199

Merge branch 'pr/nolta/177'

fix vouch#185 ignore JSON for User.ID

convert int to string

Merge branch 'pr/artagel/171'

Merge branch 'master' of github.com:vouch/vouch-proxy

Merge branch 'pr/libussa/161'

Merge branch 'pr/davidgibbons/152'

Merge branch 'pr/madworx/151'