[#73947760] Suche innerhalb Verträgen, Bestellungen und Besuchen
[#73776166] Entfernen der Zugriffe nicht möglich wenn offene Bestellungen bestehen
[FIX CI] refactor find matcher in features/manage/delegation.feature
[#75876190] [#75875856] [#75805622] Änderungen der Szenarien

Merge branch 'master' of https://github.com/zhdk/leihs into upcoming

Conflicts:
	features/examples/ausleihe.feature
	features/examples/benutzerverwaltung.feature
Merge branch 'master' of https://github.com/zhdk/leihs into upcoming
revert code erroneously removed during resolving conflicts on previous merge with upcoming
[FIX CI]
[FIX CI]
[#75876190] exclude retired items from assignment in hand over

Squashed commit of the following:

commit 75faa423f787be8a7e50afe5e991edcb3f6b2709
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Jul 30 13:33:37 2014 +0200

    refactor coffee controller

commit 48ec3c9f28c416fb0960e6244400cda10d7ce7ef
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Jul 30 13:07:12 2014 +0200

    impl

commit 1d60a68d2120b567fa17cd9abf7cadc15d7f9b12
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Jul 30 13:02:53 2014 +0200

    second test

commit ec52d09fee064dbd351c07ff723e64dad76284e3
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Jul 30 11:42:27 2014 +0200

    retired scope for item

commit f11fcd27907ff7939e1544fd298b77cd68e1a300
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Jul 30 10:10:09 2014 +0200

    [FIX CI]

commit e62a68db43f8ebde4a727b120fd55ee2dad5aeb9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Jul 30 11:38:36 2014 +0200

    second test WIP

commit fe227167d63f844efe8fc4c66b8f5014a2008ef1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Jul 30 11:32:58 2014 +0200

    first test
upgrading gems (in particular capybara, rspec, haml) and adapting rspec syntax
[#74113684] Redesign Inventarliste
[#74932978] Alle Gegenstandsfelder innerhalb Gerätepark exportieren
[#75875856] [#75805622] optimizing picking list

Squashed commit of the following:

commit f73ce262ac035a27195272b8c5ea0cf40edd9a85
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Aug 5 16:51:41 2014 +0200

    [FIX CI]

commit 2ce071989b187cb3e51ada4299b1d2dd151510a0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Aug 5 16:12:57 2014 +0200

    [FIX CI]

commit ced68fa4c852d17f774d7add7c4cb3e33a4e2ae6
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Aug 5 11:54:20 2014 +0200

    [FIX CI]

commit 1e842f9323a322c1105369e7bf235b81c9517d07
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Aug 5 10:43:20 2014 +0200

    ItemLine validation, Model#find_by_name, fixing contract_line factory

commit 199277e3293ce4d0e310de4019f02f1abf2ba5c8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Aug 4 18:30:40 2014 +0200

    tagging failing scenarios on CI, not reproducible locally

commit 6e9d422a845b3bb8477858a455f828beb1868820
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Aug 4 17:10:01 2014 +0200

    [FIX CI]

commit 3a2e777af302a131d0e1c988d6a95e02a90caa75
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Aug 4 16:59:24 2014 +0200

    [FIX CI]

commit e0e9a3569e86ac53f85234903ff4682a9e942fcd
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Aug 4 14:56:46 2014 +0200

    @current_inventory_pool instead of @ip

commit e7ea0acfc20860d8037d50a58b245dc81cbf5901
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Aug 4 12:49:18 2014 +0200

    removing @firefox tag where not needed

commit 66933e5db394b8a4cfd799dc2c91cc80e89677ff
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Aug 4 12:16:03 2014 +0200

    assertion syntax (expect instead of should)

commit e63396ca4534eebf422948857afa2636bd827117
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Aug 4 12:04:25 2014 +0200

    (wip) @current_inventory_pool instead of @ip

commit e9ac26af7283803785ca4d8241574e647460c24f
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Aug 4 11:36:24 2014 +0200

    describe spec with type request and use plain string path

commit 1204b7c1434a2e18daf1e6753907c19864cab6d7
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Aug 4 11:10:02 2014 +0200

    picking list optimization

commit 4fe7d850059a3d0fd0e12b84ada55286fc8dfa18
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Jul 31 16:40:03 2014 +0200

    removing unused gems (just a try)

commit 0e78cb7e3420744966f4d1f93065c7e9b1fc2081
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Jul 31 16:04:25 2014 +0200

    (wip) picking list optimization
[#61566024] Suche in Borrowbereich mit Leerzeichen in Modellnamen
[#74113684] Neue Inventarliste
[#74932978] Felder für den CSV-Export
no message
Merge branch 'upcoming' of github.com:zhdk/leihs
[#74932978] Feldnamen angepasst
[FIX CI] attachment/image factory