[BUGFIX] Add controller to layout link

Links in layout templates should have a controller set,
to avoid wrong links if controllers share the same layout.
Merge branch 'master' into 20140930_access_roles