Don't use that cucumber.yml file.
ETH splash screen German fixes.
Cucumber should be able to find the cucumber.yml file even here, and upgrades should now no longer overwrite it.
Better exit code handling.
Trying different exit code handling again.
[Finish #33225489, #33958845, #33960537] improve cover selection & minor stuff + bugfixing

Squashed commit of the following:

commit d7dc56f0fd25a829ebd64ece2e31ef6111f7730d
Merge: 5ca3b69 25e8b3e
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Aug 17 10:52:28 2012 +0200

    Merge branch 'next' into sp_improve_cover_selection

    Conflicts:
    	config/cucumber.yml
    	features/examples/create_and_edit_workgroups.feature
    	features/examples/create_set.feature
    	features/examples/curated_set.feature
    	features/examples/explore/list_view.feature
    	features/examples/explore/overview.feature
    	features/examples/extended_set_settings.feature
    	features/examples/finished/create_and_edit_workgroups.feature
    	features/examples/finished/create_set.feature
    	features/examples/finished/curated_set.feature
    	features/examples/finished/extended_set_settings.feature
    	features/examples/finished/list_view.feature
    	features/examples/finished/metadata_context_groups.feature
    	features/examples/finished/overview.feature
    	features/examples/finished/overview_1.feature
    	features/examples/finished/ownership.feature
    	features/examples/finished/permissions.feature
    	features/examples/finished/placeholder_for_git
    	features/examples/finished/sets_in_sets.feature
    	features/examples/finished/upload.feature
    	features/examples/import/upload.feature
    	features/examples/list_view.feature
    	features/examples/manage/create_and_edit_workgroups.feature
    	features/examples/manage/create_set.feature
    	features/examples/manage/curated_set.feature
    	features/examples/manage/extended_set_settings.feature
    	features/examples/manage/metadata_context_groups.feature
    	features/examples/manage/overview_1.feature
    	features/examples/manage/ownership.feature
    	features/examples/manage/permissions.feature
    	features/examples/manage/sets_in_sets.feature
    	features/examples/metadata_context_groups.feature
    	features/examples/overview.feature
    	features/examples/overview_1.feature
    	features/examples/ownership.feature
    	features/examples/permissions.feature
    	features/examples/sets_in_sets.feature
    	features/examples/upload.feature

commit 5ca3b690965d4c33ecf70b1b94311f969a0cb227
Merge: 1d05dcb ad13e8f
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Fri Aug 17 10:02:19 2012 +0200

    Merge branch 'sp_improve_cover_selection' of github.com:zhdk/madek into sp_improve_cover_selection

commit 1d05dcbe209bc4bf3e79f8babf5225c02b563f1f
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Fri Aug 17 08:44:31 2012 +0200

    Conflict resolution.

commit ad13e8f801cb4300bf9fefa2c131032a10440764
Merge: 76a91a8 050982d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Aug 17 09:27:02 2012 +0200

    Merge branch 'sp_improve_cover_selection' of github.com:zhdk/madek into sp_improve_cover_selection

commit 76a91a84c44deb99d3a8ccf093ab3387aabdd6ae
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 18:28:19 2012 +0200

    this usage of disjunk tags is correct in cucumber

commit 050982de54e53307494b7cf8b43656f46e5e73c0
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Aug 16 17:56:54 2012 +0200

    Better exit code handling (conflict resolution).

commit 1317440de6436b0ca351340f4c3f118eecaffa67
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 17:45:11 2012 +0200

    add @upcoming for flag scenarios that should not be touched by cucumber

commit 53caba66e81c483ad04532c55be60ed139e2ea94
Merge: 9bf0c4c 3ae606c
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 17:11:20 2012 +0200

    Merge branch 'sp_improve_cover_selection' of github.com:zhdk/madek into sp_improve_cover_selection

commit 9bf0c4c8859d800594553d8415fb41a4f6fbbde6
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 17:10:56 2012 +0200

    cucumber settings once is enough

commit 3ae606c761a8ce06f2ac96ac062daed15a8d777a
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 17:16:14 2012 +0300

    Update app/assets/javascripts/app/views/media_set/cover/no_children_error.tmpl.haml

commit 251249e1ef1060d8625fda7dc75b58a246f2ad49
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 13:35:52 2012 +0200

    removed upcomming from cucumber settings

commit 0c3101dac6ca19e6d9eedafd8a9ad76ad14088ae
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 09:50:16 2012 +0200

    [FIX CI] Switch the not implemented tests to pending

commit a813f18c726a44bdb767c21572eda47270bcf506
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 09:10:45 2012 +0200

    [FIX CI] Scenario: Create set

commit 89f58ae67014f3b866b7c23d94f2ea29fba8f33f
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Aug 15 16:51:26 2012 +0200

    [#33225489] Set: Titelbild, Sortierreihenfolge, Darstellung

commit 0de4714929373c8f660dad0b08a107244ba41575
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Aug 15 16:40:31 2012 +0200

    Cleanup examples folder
[#33952241] showing thumbnails on the graph inspector
refactor callback (making delete_file as private, executed only on proper destroy)
[Fixed #33960537] Liste zeigt Metadaten aus dem Kontext Institution nicht an, obwohl Daten vorhanden sind
due tue MAdeK_feature_branches #798 and MAdeK_slow #264

Squashed commit of the following:

commit dbd7f83dbcd2b818f2ad513983cd378ede800c7e
Merge: 40b8374 8792af5
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Aug 17 11:34:20 2012 +0200

    Merge branch 'next' into sp_bugfix_33960537

    Conflicts:
    	app/assets/javascripts/app/views/media_set/cover/no_children_error.tmpl.haml
    	app/helpers/json/meta_term_helper.rb
    	cucumber.yml
    	features/create_and_edit_workgroups.feature
    	features/create_set.feature
    	features/curated_set.feature
    	features/examples/create_and_edit_workgroups.feature
    	features/examples/create_set.feature
    	features/examples/curated_set.feature
    	features/examples/extended_set_settings.feature
    	features/examples/filter_panel.feature
    	features/examples/manage/create_and_edit_workgroups.feature
    	features/examples/manage/create_set.feature
    	features/examples/manage/curated_set.feature
    	features/examples/manage/extended_set_settings.feature
    	features/extended_set_settings.feature
    	features/placeholder_for_git

commit 40b83740663294122f1bdd4103282119c5a07213
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 13:52:11 2012 +0200

    [BUG FIX #33960537] Liste zeigt Metadaten aus dem Kontext Institution nicht an, obwohl Daten vorhanden sind

commit 251249e1ef1060d8625fda7dc75b58a246f2ad49
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 13:35:52 2012 +0200

    removed upcomming from cucumber settings

commit 0c3101dac6ca19e6d9eedafd8a9ad76ad14088ae
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 09:50:16 2012 +0200

    [FIX CI] Switch the not implemented tests to pending

commit a813f18c726a44bdb767c21572eda47270bcf506
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 09:10:45 2012 +0200

    [FIX CI] Scenario: Create set

commit 89f58ae67014f3b866b7c23d94f2ea29fba8f33f
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Aug 15 16:51:26 2012 +0200

    [#33225489] Set: Titelbild, Sortierreihenfolge, Darstellung

commit 0de4714929373c8f660dad0b08a107244ba41575
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Aug 15 16:40:31 2012 +0200

    Cleanup examples folder
just check whether AppSettings.featured_set_id is defined in order to display the icon link
cleaning up unused code (based on the test coverage and manual check)
using wait_until instead of wait_for_css_element
Merge branch 'FS_cleanup_unused_code' into next
[#33474495] Template für MetaTerms during upload
MAdeK_feature_branches #817 and MAdeK_slow #282

Squashed commit of the following:

commit 6384a139b5f3c5b80ade65efae26773104ad8576
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Sat Aug 18 15:10:40 2012 +0200

    [FIX CI] timing things

commit cf1c778b7ed25f19002ed8cb20fd623ecdd3228d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Sat Aug 18 00:27:14 2012 +0200

    Debugging info for CI

commit bc56f1676b2a34666525aca4dbb510c86f21a8d1
Merge: 066a5d1 7a6f15d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Aug 17 22:06:18 2012 +0200

    Merge branch 'next' into sp_meta_data_meta_terms_import_template

commit 066a5d18ba24e6a009926c9a3315704730e06deb
Merge: 2bf77de 83ef60f
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Aug 17 22:05:02 2012 +0200

    Merge branch 'sp_meta_data_meta_terms_import_template' of github.com:zhdk/madek into sp_meta_data_meta_terms_import_template

commit 2bf77deadbe77759d3ca063117e67df4bf70d528
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Aug 17 22:04:45 2012 +0200

    finish integration tests and fix some more bugs

commit 83ef60fcfc427c9a07cce964bb6b53840e114d1b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Aug 17 17:14:20 2012 +0200

    fixing CI: reverting value setter for departments (to be reconsidered)

commit 9ba02934c0f341449d3e54f61f04771e65e65c01
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Aug 17 16:14:06 2012 +0200

    fixing meta_datum subclass value setter

commit 11f2e8542294cb6ff1b38fee14ff2f38af67313f
Merge: 68f454a cbbb09d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Aug 17 14:58:48 2012 +0200

    [#33474495 WIP]

commit 68f454a2a5925c737763a12e8351e915a89f98b3
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Aug 17 12:56:27 2012 +0200

    [#33474495 WIP] Template für Metaterm is missing

commit 1a55e7c008b407c417b8f68995b14fb80ea4bb69
Merge: 7741e6e 2a55c4d
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Aug 17 10:53:42 2012 +0200

    Merge branch 'sp_meta_data_meta_terms_import_template' of github.com:zhdk/madek into sp_meta_data_meta_terms_import_template

commit 2a55c4d32a693d64e6edbaa7e1bb6fc097599dc2
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Fri Aug 17 08:44:31 2012 +0200

    Trying different exit code handling again.

commit 7741e6e70293e68bf44701ad03c89cc9a38b5e83
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Fri Aug 17 09:51:34 2012 +0200

    set values for set data after loading meta terms(checkboxes)

commit 6259e8942a78b269b57cbcca08f061372b3a038e
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Aug 16 17:56:54 2012 +0200

    Better exit code handling.

commit e3edbb91d887db2a2eb79fb433bc70e4e99ea789
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 18:24:56 2012 +0200

    [#33474495 WIP] Template für Metaterm is missing

commit 73d5756459ca5bf00ebe48a5e235824eaaf45e6a
Merge: cd17b77 53caba6
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 17:41:46 2012 +0200

    [#33474495 WIP] Template für Metaterm is missing

commit 53caba66e81c483ad04532c55be60ed139e2ea94
Merge: 9bf0c4c 3ae606c
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 17:11:20 2012 +0200

    Merge branch 'sp_improve_cover_selection' of github.com:zhdk/madek into sp_improve_cover_selection

commit 9bf0c4c8859d800594553d8415fb41a4f6fbbde6
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 17:10:56 2012 +0200

    cucumber settings once is enough

commit 3ae606c761a8ce06f2ac96ac062daed15a8d777a
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 17:16:14 2012 +0300

    Update app/assets/javascripts/app/views/media_set/cover/no_children_error.tmpl.haml

commit 251249e1ef1060d8625fda7dc75b58a246f2ad49
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 13:35:52 2012 +0200

    removed upcomming from cucumber settings

commit 0c3101dac6ca19e6d9eedafd8a9ad76ad14088ae
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 09:50:16 2012 +0200

    [FIX CI] Switch the not implemented tests to pending

commit a813f18c726a44bdb767c21572eda47270bcf506
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Thu Aug 16 09:10:45 2012 +0200

    [FIX CI] Scenario: Create set

commit 89f58ae67014f3b866b7c23d94f2ea29fba8f33f
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Aug 15 16:51:26 2012 +0200

    [#33225489] Set: Titelbild, Sortierreihenfolge, Darstellung

commit 0de4714929373c8f660dad0b08a107244ba41575
Author: Sebastian Pape <email@sebastianpape.com>
Date:   Wed Aug 15 16:40:31 2012 +0200

    Cleanup examples folder
Chmod the file so X-Sendfile works again.
Correct type for chmod.
Fix for ruby-ldap incompatibility with 1.9.3
upgrading gems and to Rails 3.2.8
implement help/glossary/collapsible
Merge branch 'sp_glossary_collapsing_for_help' into next