#2211
Merge branch 'master' of github.com:molgenis/molgenis
#2211
Merge pull request #1006 from jjettenn/master

#2211 As Triumph user I want to design search/visualization tools
Build activationUrl from x-forwarded-header if forwarded. Fixes port 8080 problem when using SSL
Merge branch 'master' of https://github.com/molgenis/molgenis