[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