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