fix links to text-page
improve info/intern overview page
fix merge conflicts
Merge branch 'project-hiroshima' of github.com:Freevle/Freevle into project-hiroshima