Branch 2.8.1 merged back into Trunk
Codechanges using blocks to avoid to generate the "switch"-link right-top, if the user has no permission to edit the other one.
Added argos_theme