Felix's edits in views, loggedinhtml
Merge branch 'master' of https://github.com/fephsun/orgo
Periodic commit