add log/in/out/up links
merge branch origin/master
restrict show to question owner