Support Shibboleth rudimentarily.
Merge branch 'master' into rca_port_shibboleth
Merge branch 'master' into rca_port_shibboleth
[BUGFIX] group manager does not have access to ModelsController#timeline

Squashed commit of the following:

commit d205af7a467fd6bb4c6d9cb8c778a53b4ac429dd
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Oct 2 17:20:34 2014 +0200

    test prepare

commit 4d02c557f37d121a4ea7997dafd7a558288996ac
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Oct 2 17:17:11 2014 +0200

    refactor admin check in required role

commit 4bf4d75b9839722e9431ab1a7c3bae6f9a11613c
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Oct 2 17:09:50 2014 +0200

    fix
squash merge in upcoming

Squashed commit of the following:

commit 5217d26454e5270270fc5651e3683b8c89b42528
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Oct 3 14:54:14 2014 +0200

    remove duplicate scenario

commit 18df647e6c0353e6846e16d9a5087db8d0f7c4b0
Author: Nadja Weisskopf <nadja.weisskopf@zhdk.ch>
Date:   Fri Oct 3 13:30:31 2014 +0200

    [#80012686] Timeline (translation in English)

commit b8a483c28fa6ca1d4d4795209c277e29c1af5cef
Author: Nadja Weisskopf <nadja.weisskopf@zhdk.ch>
Date:   Fri Oct 3 12:01:32 2014 +0200

    [#80012686] Timeline for group-admins
Merge branch 'master' into fs_personas

Conflicts:
	features/personas/dumps/minimal_seed.sql