Merge pull request #1006 from jjettenn/master

#2211 As Triumph user I want to design search/visualization tools
small changes in the menu
Merge branch 'master' of https://github.com/molgenis/molgenis
changed the hardcoded url of static plugins
removed edit attribute in the controller
Build activationUrl from x-forwarded-header if forwarded. Fixes port 8080 problem when using SSL
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge pull request #1007 from RoanKanninga/master

changed the hardcoded url of static plugins + small changes in the menu
formatting change
formatting attempt 2
Merge pull request #1008 from bartcharbon/master

Build activationUrl from x-forwarded-header if forwarded. Fixes port8080 problem when using SSL
fixed home url
Merge branch 'master' of https://github.com/molgenis/molgenis
changed back the name Homecontroller
removed some unused/unnecessary code
Merge pull request #1009 from RoanKanninga/master

fixed home url
logo's for triumph, small for menu, big for homepage
fix test
Merge pull request #1010 from RoanKanninga/master

fix test
Merge pull request #1011 from bartcharbon/master

logo's for triumph, small for menu, big for homepage