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
[#80098490] changing own password for user with Database Authentication
[#61545922] fix selecting category after search
Retrieve coverage data from Cider CI and generate reports.

Squashed commit of the following:

commit 5849859d3c503cc2705c08d4cf356e0383bee93d
Merge: beb70a6 9673ce0
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Oct 8 10:30:21 2014 +0200

    Merge branch 'master' into rca_cider_coverage

commit beb70a62d5087a33e2c34fdd4d91c7ca787b6e50
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Oct 8 10:29:44 2014 +0200

    Finished retrieval and report.

commit bb8842fd7ed7654474f29026b45527e506183bfa
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Oct 7 19:16:37 2014 +0200

    First working (?) coverage gatherer.

commit 5727ac1e22bba8c9b8df69e2e40340e0e6f6c58d
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Oct 7 16:51:07 2014 +0200

    Crawling towards coverage merge.

commit ff1864b0f264d1a1dabe3562a7e8a9adb154350a
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Oct 7 13:31:33 2014 +0200

    Retrieven trial attachment hrefs.

commit fd346c5a400ca05faa3bf2a5f8639f2c7b99fa19
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Mon Oct 6 15:56:02 2014 +0200

    Some more clarification.

commit 24f0b7b264282e9912c7eb1b558b918e575bfce3
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Mon Oct 6 15:43:55 2014 +0200

    Cider CI attachment retrieval stops on 404.

commit 2ee8058a19559bdc75e11ed6a3da69a558d20adf
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Mon Oct 6 13:26:06 2014 +0200

    Starting on a script to retrieve all trial attachments

commit e6adae9b1671025ebe2d198eae1a18815d7ae7f2
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 2 17:12:42 2014 +0200

    Revert "Maybe the glob likes escapes. Maybe?"

    This reverts commit 0cc6fe101d16cf9f84475469bd4d490cb74bd348.

commit 0cc6fe101d16cf9f84475469bd4d490cb74bd348
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 2 11:20:34 2014 +0200

    Maybe the glob likes escapes. Maybe?

commit 9791d8fa1efe90d726d8099e95f21fa2381687e2
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 2 10:03:28 2014 +0200

    Trying to make the hotspots actually execute anything.

commit 8bc4fd0b391e3410cf9688ef79544f5d4828e5e0
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 2 10:01:09 2014 +0200

    Correct MIME type.

commit 40ce48b75a72edc53785b33b52e7551d6099092f
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 2 09:58:59 2014 +0200

    Trying to get some coverage reports out of Cucumber.
Add a stupid form of recursion so we can gather all tasks.
More output so you don't think it crashed
[HOT FIX] fixing infinite loop on daily view (reverting refactoring code)
Merge branch 'fix_daily_view'
Fixing US date format.

Squashed commit of the following:

commit 75dba096b0d653be27b6d51a72bb7ab67b8518af
Merge: 594e74e e27ba44
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Oct 15 10:18:51 2014 +0200

    Merge branch 'master' into rca_fix_us_date_format

commit 594e74e8a3547f256af127c8ce16ef2be7f206e4
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Oct 15 10:18:13 2014 +0200

    Add English (US) everywhere.

commit b50416b1940de104da53213921eedb86d258d609
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 2 14:23:10 2014 +0200

    Remove broken string

commit cabe9a179758d567d0fcbcf4ced09f517dc9ac9c
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 2 14:19:46 2014 +0200

    Add en-US, remove es
Cleaning up after adding English (US) to our seeds.

Squashed commit of the following:

commit b901adc818d1af0c9afe70e2449311c52cfd5f12
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 16 15:04:29 2014 +0200

    Fixing scenario.

commit 31edb714c36254b7aab679027e2940869bb8241d
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 16 14:04:16 2014 +0200

    Fixing aftermath of English (US)

commit 9cbbffc1dabd35440530e444cd38cb9c5311bd1a
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Oct 16 12:19:28 2014 +0200

    New test seeds.

commit 46f8e51dbcaceebd8f7bb70de594f1692f7454ef
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Oct 15 16:33:27 2014 +0200

    Use correct word for top-level.

commit d5428f7487d17ab541f79d60b48b136af630adf1
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Oct 15 15:28:23 2014 +0200

    Mixing languages leads to a lexing error.

commit 13ba79eccb7de27a89f87b1d4aeb30a74c4579e5
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Oct 15 15:28:05 2014 +0200

    That doesn't seem to work in Ruby 2.1.3.
[#79509582] fixing top position of dropdown menu
Merge branch 'master' of https://github.com/zhdk/leihs into upcoming

Conflicts:
	features/examples/timeline.feature