[#77529544] refactoring personas to dataset, describing it through scenarios

Squashed commit of the following:

commit 3a208a619944ec9097810ad39afba5b61d98fc60
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 24 11:26:33 2014 +0200

    regenerated dataset

commit 7d622546df9c64ac49bb5cd91f135455b9a6567b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 23 23:30:38 2014 +0200

    regenerated dataset

commit 81c64eb76a27cb6fd73f5838338876dcc6bc176b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 23 15:41:32 2014 +0200

    regenerated dataset

commit 1621442621387231ebd377f888ffd235410f58ca
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 23 15:39:32 2014 +0200

    [FIX CI]

commit 017c96fb476383884136a5dee2fdd8ae5fe02685
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 23 15:19:16 2014 +0200

    regenerated dataset

commit b1744e54d1fe1ae022df9aa6ccb50ba8031ac61b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 23 12:49:34 2014 +0200

    extend Array random just once

commit 6bdf984562cb106cc5089ea8cdce2a16b63c7a8a
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 23 12:17:55 2014 +0200

    [FIX CI]

commit f281c413c8e777bfec9b6429c108287c20ab3524
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 23 12:16:50 2014 +0200

    test Dataset: override Array#shuffle and Array#sample (back again 2)

commit 6341a1d734ec618f7ad2e2b9e2882185233e6825
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 23 01:52:35 2014 +0200

    regenerated dataset

commit 02450dec5128763cc71a5ffa531c5b06cf3eb53b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 23 01:12:06 2014 +0200

    [FIX CI]

commit 27edd902e6a08606fa2dfdb8026e220e050212b0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 23 00:53:06 2014 +0200

    regenerated dataset

commit 1dd7c08e059646410774c202d1acd1dbdcc58ade
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 23 00:19:33 2014 +0200

    [FIX CI]

commit 85ce5a6c28c5248258ad79e30e62a4d584426f67
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 22 23:00:05 2014 +0200

    [FIX CI]

commit 2759be92a62c95c5152ad9b6c2a6bca8a860e1dc
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 22 14:53:57 2014 +0200

    regenerated dataset

commit a2b95d9b3f56bac469e301f2e0d9288e7ccaa7ec
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 22 13:58:40 2014 +0200

    regenerated dataset

commit e9cd76cfcc1a1392ea1590f98fe62edcf57f7178
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 22 13:23:09 2014 +0200

    [FIX CI]

commit 1de3316f0dc0291cd196a531b7537c876ac1ae89
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 22 13:04:13 2014 +0200

    testing with firefox browser only

commit 0f76b128f24a4bc2e99ca4a9dbccd52e89caebeb
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 22 13:01:18 2014 +0200

    [BUGFIX] forward all contract_lines purposes to spine

commit d35533646bf4a1dc5e26a2b85b5a00c35a81e279
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 21 18:47:18 2014 +0200

    regenerated dataset

commit ab44f739555e6af598d5842383c7e84b3257cdf4
Merge: 842abd8 0bbb28b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 21 16:14:50 2014 +0200

    Merge branch 'master' into fs_personas

commit 842abd8ad2d8b1cd9da43615550bacbc0dc287c9
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 21 16:12:32 2014 +0200

    Merge branch 'master' into fs_personas

    Conflicts:
    	features/examples/bestellungen.feature

commit eb894c5432f5d7351459895e1f2df0cfaacf1e01
Merge: aba7923 8bf919e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 21 16:11:24 2014 +0200

    Merge branch 'master' into fs_personas

    Conflicts:
    	features/examples/bestellungen.feature

commit aba7923752caafe72a6cfa8176ebb24048dc1755
Merge: bb9ef2b fc3219b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 21 16:01:41 2014 +0200

    Merge branch 'master' into fs_personas

    Conflicts:
    	features/examples/timeline.feature

commit bb9ef2b6a55793419a8a909840ae1f834dbcef0b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 21 00:46:02 2014 +0200

    [FIX CI]

commit 5bbc38a6f99e38e83023c778799fd2674e831f19
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 21 00:18:28 2014 +0200

    [FIX CI]

commit a92353cc83e014a1e992fd6f166e3559458fc61c
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 20 23:24:24 2014 +0200

    improving dataset

commit b983cf59c4bcbf849916a00dcefe57daa539f508
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 20 17:41:44 2014 +0200

    [FIX CI]

commit 6b4739413999c4a50c2677b7d5524b0fd7962db4
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 20 17:27:56 2014 +0200

    tagging scenarios

commit 2a4266475dd7e092ae306b81be9696943b2d4b92
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 20 16:43:33 2014 +0200

    [FIX CI]

commit 1950d48fb5a128fa01c68bf9c7297aa45a76aba4
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 20 15:55:33 2014 +0200

    generating dataset between monday and friday

commit 472e620dd5143c60dbe797b5fba8103cd3a396d3
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 20 15:44:04 2014 +0200

    merging steps (wip)

commit 5a0779aff6ccec322a50d557e32d16bc989f73fa
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 20 15:25:52 2014 +0200

    remove Array overrides (again)

commit f5bb6ee9916e2d7d36967e4810c59cc469a808b4
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 20 14:38:29 2014 +0200

    test Dataset: override Array#shuffle and Array#sample (back again)

commit c53a860722060b9a303e443d1671c57546d6e9a0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 20 12:19:17 2014 +0200

    [FIX CI]

commit b4bbf37a02a8dc6d2025e9235e0bfa8fef6a16f5
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 20 11:51:25 2014 +0200

    [FIX CI]

commit 62d9d420b9b22bc58922090f3fb52fa6d508e0d0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 20 11:10:28 2014 +0200

    [FIX CI]

commit efb8c7b5d8ffdf9d3d2343659c6eac7c0d684da7
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 20 00:31:28 2014 +0200

    regenerated dataset

commit e6ec8d9914fa0f8a0289ef17579555433ccc0c1d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sun Oct 19 23:36:15 2014 +0200

    [FIX CI]

commit d0e60c9c7730f8f7defe682efcd79cbf85830776
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sun Oct 19 22:53:55 2014 +0200

    regenerated dataset

commit 450fb6cef0220641fa9bfb7754442316c61c9919
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sun Oct 19 22:18:12 2014 +0200

    regenerated dataset

commit 75dee02ad1b1c9dc4ae526b43f33319d96247430
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sun Oct 19 21:48:58 2014 +0200

    [FIX CI]

commit 5250b6c77405e15f9cc45078c43dd5216126a011
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sun Oct 19 21:37:14 2014 +0200

    [FIX CI]

commit 45b0fce7ad2b4830640e3526725580664604454b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sun Oct 19 19:49:17 2014 +0200

    CI hotspots

commit f72d7d7141cad5804ed39a27a7dd8410fdfbcfe8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sun Oct 19 19:39:47 2014 +0200

    CI hotspots

commit 0c2f7d8dde455cecffdae7e3741fe3552461f6e3
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sun Oct 19 00:17:49 2014 +0200

    [FIX CI]

commit 79865dce076bbdab337a6136c55eda3d6df31e4e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sat Oct 18 23:54:30 2014 +0200

    [FIX CI]

commit 21874df39cf009c076013e45c9a90c0a9e849c99
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sat Oct 18 23:22:29 2014 +0200

    [FIX CI]

commit a27754d2a43540c41ed26e2429f3039c510067b6
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sat Oct 18 18:38:00 2014 +0200

    improving dataset

commit cc9811f942f8bd6d484ce62b15b11af60df7052c
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sat Oct 18 00:15:23 2014 +0200

    improving dataset

commit 83a63d66a40974e350580d48f1d076505aad4070
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sat Oct 18 00:08:54 2014 +0200

    improving dataset

commit 3e00e28157b3b31567e4c6ef193b9009e062555d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 17 22:38:38 2014 +0200

    [BUGFIX] selecting the correct inventory pool editing a contract line in the borrow section

commit 31bb1971cca061932eda58c2afbd79f82cf5016b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 17 18:15:29 2014 +0200

    [FIX CI]

commit 538f8bf484cc94f8f434fecd24a207fe1f76169b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 17 14:24:46 2014 +0200

    User#address

commit 247fe206178842bf8cc89983bdb5f9c4b2a57d5a
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 17 13:16:32 2014 +0200

    [FIX CI]

commit 8edc495898aad11ec98f00f852bb9239e822765e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 17 11:02:09 2014 +0200

    [FIX CI]

commit f692a7fc783873067f554cdeb63308b0c596afff
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 17 00:23:38 2014 +0200

    regenerating dataset

commit b48ddc88a7e8f253f3313de08d5ef865fca7213d
Merge: 6f2e30b 7b9cdf9
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 17 00:21:51 2014 +0200

    Merge branch 'master' into fs_personas

    Conflicts:
    	cider-ci/tasks/cucumber.yml
    	cider-ci/tasks/cucumber_scenarios.yml
    	features/examples/timeline.feature
    	features/personas/dumps/minimal_seed.sql

commit 6f2e30bfb862793f7318e124b683b04c410fefac
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 16 23:50:20 2014 +0200

    [FIX CI]

commit caff9d2ec68383476d999c06515770a1c814be00
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 16 23:50:08 2014 +0200

    including jquery-ui stylesheets and adapting custom overrides

commit 520ecc7a14d1a4c4a0b07abb8af1ffd5182aaf1e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 16 14:43:09 2014 +0200

    [FIX CI] reverting previous commit and check building on location model

commit 6bd543f65b5545b3db97bb9ed781aecaf7695c40
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 16 12:36:24 2014 +0200

    [FIX CI] fixing autocomplete when selected value is "None"

commit af592c08ab561421dfeadb0583a2688fc94950ca
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 15 14:30:20 2014 +0200

    [FIX CI] adapting selectors to new jquery-ui

commit 1bbe7dc15def30a781d78bd8a4fdeced7a56f9f8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 15 13:21:51 2014 +0200

    upgrading jQuery-UI (introducing the jquery-ui-rails gem)

commit 6b17062a03cd57ffe3acc2029fd5a5c89bef5030
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 15 13:07:13 2014 +0200

    adapting jQuery syntax: using prop() instead of attr()

commit b7f83fafd72827dfa13a1cd9bba78b66e529f1d3
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 15 12:22:03 2014 +0200

    fixing jQuery on() syntax

commit 60f87453315c3797eca63894b173fbf707505d2c
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 15 11:52:43 2014 +0200

    upgrading jquery

commit 469e58da54c0b199ba6ad6067d6e4bee99b3e418
Merge: 0ae4b39 e27ba44
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 14 15:25:55 2014 +0200

    Merge branch 'master' into fs_personas

commit 0ae4b3938cc53db78bd8133772c8141e3c3f3cf0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 14 13:41:20 2014 +0200

    data-ids instead of data-line-ids

commit 1d86007caa8fe357d4a6b923faf0af998fc17a44
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 14 12:34:53 2014 +0200

    fixing dataset

commit 34ae6c7bba08c3417d8a1d8ef2f3a4252688d28e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 14 11:52:06 2014 +0200

    [FIX CI]

commit 8e0de936dcec5ce99c0deac01d58cc8271a8aaaa
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 14 11:02:17 2014 +0200

    [FIX CI]

commit 514489da5dec1b84ca3f3785a8e2eb0a39e1cf55
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 14 09:27:09 2014 +0200

    [FIX CI]

commit 2cd07a3d43ff4b35e3c869b80222537dc7184e3b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 14 01:09:06 2014 +0200

    [FIX CI]

commit 1150a1376e5ab8fa649ec8ec05dbf1255e258cdf
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 14 00:43:42 2014 +0200

    using where.not() syntax

commit 798fdc1267b4e645c4c139c1e4b363959c5c6d89
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 14 00:33:52 2014 +0200

    [FIX CI]

commit 16592747844c9fd44eb69510fd875157be1b5233
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 13 16:05:51 2014 +0200

    [FIX CI]

commit 68f070a9420c9c0c2375327992781a922b37f295
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 13 15:37:18 2014 +0200

    fixing dataset

commit bfdfc3dbcf2d056ff0b8f6dcd51642e1d20a30e2
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 13 14:11:45 2014 +0200

    regenerate dataset

commit f6f27b58d0f0b17d7e44705353a7bbb74e724e1e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 13 13:24:42 2014 +0200

    [FIX CI]

commit 9623e2206f5977ffe78c75087aedff2056c3d63f
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 13 12:48:27 2014 +0200

    switching browser window

commit 3493327297e36c33907f521428f604a447846eda
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 13 11:45:23 2014 +0200

    groupped tasks for CI

commit f3f79a756eca4530072a335955c228f68da68255
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 10 16:19:53 2014 +0200

    test on CI with Chrome as default browser

commit 991b224adc553bd19cb2094b9057937370a5a365
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 10 15:56:48 2014 +0200

    [FIX CI] fixing steps for booking calendar

commit 20926445e02f025923058fff281730763d6a51ba
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 10 14:27:47 2014 +0200

    [FIX CI]

commit 9cf7c0fcd624071c7bb8e64ce4c5658aded6a8a8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 10 12:25:32 2014 +0200

    rspec syntax

commit a8c446dcb15dc4a7918e841aca5914a5060c7b2c
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 10 12:00:30 2014 +0200

    [FIX CI]

commit 6019b19de5053b4c1caa9cab652ed45a2deababa
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 9 15:53:10 2014 +0200

    2 auto trials, 300 seconds timeout

commit 977ef72d8c0aeacd9efa1b1fb628acf595b4330a
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 9 15:39:30 2014 +0200

    raise timeout and 1 auto trial

commit defabb08cb53ece97939a5f9c81e129b4d2149fe
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 9 15:36:54 2014 +0200

    [FIX CI]

commit 7388a20b99a613c43888f0eecdfb438ff6826e8e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 9 15:20:50 2014 +0200

    [FIX CI]

commit c30f9365e6d9f40d3b3aa8e3a487c7678b6711d4
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 9 15:00:05 2014 +0200

    [FIX CI]

commit 68251ce575d3a2ac83680998d30155916af77081
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 9 14:04:56 2014 +0200

    rearrange feature files

commit efef85d095a6d9faef3d2f86411998a3bb7d1051
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 9 14:04:32 2014 +0200

    [FIX CI]

commit 6000477d56e00cffc4a5391740d44101f7cadc89
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 9 13:36:31 2014 +0200

    improving factory for dataset

commit f2a957f72be3237d8601a090797c9c8ba5f31f46
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 9 12:51:17 2014 +0200

    reducing factory for dataset

commit 3776ce4304aeea1ff1ef55715d000dcac8140f2c
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 9 12:37:02 2014 +0200

    [FIX CI]

commit df56ffd67fd5a5592b3dedfc5d47c21c474827a1
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 8 16:30:25 2014 +0200

    using only preChange event listener

commit 602358070dc2b4c722a2688cc96f27103eb34493
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 8 15:57:39 2014 +0200

    using spine destroy callback properly

commit 42e68cd4f1091067b9d44ce4043a005d8580d53e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 8 14:44:15 2014 +0200

    [FIX CI]

commit f08c615010d3c44470b963761824204ff0a358f0
Merge: a4ac612 8f2a43e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 8 13:50:41 2014 +0200

    Merge branch 'fs_change_password' into fs_personas

    Conflicts:
    	cider-ci/tasks/cucumber_scenarios.yml
    	features/personas/dumps/minimal_seed.sql

commit a4ac612ae129f00a3a9983239a35b5e9dbaf608d
Merge: 28a30c1 8185d4e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 8 13:49:51 2014 +0200

    Merge branch 'master' into fs_personas

commit 8f2a43eeed324b4b3a347f2f1871f520481fce02
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 8 13:21:56 2014 +0200

    [#80098490] implementation of changing own password for user with Database Authentication

commit 28a30c1fbaca7e3320fe5a545041c064a25ebf37
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 7 12:43:57 2014 +0200

    forgot in previous commit

commit 7092a8a0ea3c883eb9ab8b03b0fb963f4028725b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 7 12:39:33 2014 +0200

    fixing dataset

commit 0ad6d423b0ede91f3aa095cb9427715a7702f18b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Oct 7 01:03:04 2014 +0200

    [FIX CI]

commit 77f5e514edd715b65a22ef5214d314f5befae969
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 6 16:47:41 2014 +0200

    [FIX CI]

commit 4132c47638044d360814481fb1b83d4028668ba2
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 6 15:52:48 2014 +0200

    fixing ambiguous steps

commit 037927a042c6f93525f00e8f46b0b2eb1ff7a119
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 6 15:32:25 2014 +0200

    Merge branch 'group_manager_timeline' into fs_personas

commit 4eb0f50951e01f66780d330513cb3f002564a516
Merge: 1fc9886 ee590f4
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 6 15:31:14 2014 +0200

    Merge branch 'group_manager_timeline' into fs_personas

    Conflicts:
    	features/personas/dumps/minimal_seed.sql

commit 1fc98868866b873842b4fdf261cf6a269a633898
Merge: 4d9b383 aa6dabe
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 6 11:38:28 2014 +0200

    Merge branch 'master' into fs_personas

    Conflicts:
    	features/personas/dumps/minimal_seed.sql

commit ee590f43984f737e508926e26d8192281fa62069
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 6 11:27:48 2014 +0200

    regenerated dumps

commit 169f6505f049f93619a3aad3f77bed062e73199a
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 6 10:59:22 2014 +0200

    implementing timeline tests

commit 4d9b383dbae6d0d749cc08e480aa8b7b0dab70c0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Oct 6 10:29:11 2014 +0200

    regenerated dump

commit 3f4af73c87423b1613ffbd379a0ad952e5e8ac1f
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sun Oct 5 23:50:09 2014 +0200

    travel time instead of date

commit b741d25349bc8334e7abf91daa6b271d1d1f2cf6
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sun Oct 5 22:17:36 2014 +0200

    improving dataset

commit fd5d6b1bcabbd25843e4ecc68b2e0fbc9cd85d8d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Sun Oct 5 21:54:20 2014 +0200

    [FIX CI]

commit a27c1936a5100f5ce9c9894762daf5f5726c8549
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 3 22:26:17 2014 +0200

    [FIX CI]

commit 2191d5f507ac286a9e96d9e98ca0428ea25558b6
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 3 22:23:29 2014 +0200

    [FIX CI]

commit 5f7b9aeacc575198c191377a34361bf211f1388a
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 3 18:07:09 2014 +0200

    fixing steps

commit 1d87831eb4d8f55c9fb0ce9fe78955e78a0ae55a
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 3 17:56:31 2014 +0200

    fixing approved contract generator

commit 0ec9e81afb7384c0c79191e035d78f5981e5a33d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 3 16:04:10 2014 +0200

    fixing purpose generator

commit 608c5c40d4dfd27672843a005f93712dd266f653
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Oct 3 15:35:27 2014 +0200

    fix inventar.feature

commit ba634720d240bf11b8191a6349549e755e86baf9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Oct 3 14:41:42 2014 +0200

    fix benutzerverwaltung.feature

commit 5dca22248670969587beaeec819eef0b377a12e1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Oct 3 14:28:56 2014 +0200

    fix inventory.feature

commit 000596923392aa1c42efe92dd38382f362d44bb8
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Oct 3 13:38:11 2014 +0200

    fix software_editieren.feature

commit dc53c1eafa3bc7e8ef9a64854e9bea9295ce64b2
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Oct 3 13:09:22 2014 +0200

    fix kategorien.feature

commit e2df90cf51c0c8873494602548e7179f85c306b6
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Oct 3 11:42:51 2014 +0200

    [FIX CI] zweck.feature

commit fa3cb6a9976dc59f5af41298f733509361cfd86f
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Oct 3 11:36:03 2014 +0200

    fix categories and models

commit 7f1abef21692b67c8a009fdfc41c9a17f6d7445e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Oct 3 11:04:23 2014 +0200

    fix modelliste.feature

commit e0dc66ee05ae14eee81d447d9d0b38004e68bcd3
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Oct 3 10:25:18 2014 +0200

    fix modell.feature

commit 097026efd3506edf97c8c4790043fa4edbadf59e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 2 22:02:10 2014 +0200

    fixing models generator

commit 9da1ed8668ca411c135917dc9b48ad6e62a6fd04
Merge: e56e21a 829a287
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Oct 2 16:14:23 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

commit e56e21a7ac048bcfdf41e901b1e84f081001616e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Oct 2 16:14:18 2014 +0200

    fix generation of items for contract lines

commit 829a28711fc871c1ee63c1896e6d2bc0626945c5
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 2 15:38:39 2014 +0200

    fix availability calculation performance fixtures (no need of AuthenticationSystems since are already loaded from minimal dump

commit ac5868ab4fbe9e1e6b119b074360128574b86db6
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 2 15:31:29 2014 +0200

    fix arguments for availability

commit 513e392e0483985a30091465c9bdbf53f4e14184
Merge: a111d60 33a29a0
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Oct 2 14:50:17 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

    Conflicts:
    	features/personas/dumps/minimal_seed.sql

commit a111d6062c8e019293ed1da6acb7bdab02c26eff
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Oct 2 14:49:40 2014 +0200

    fix first suche scenario

commit f5f43f2efbe8da7e5cab04e129d4ed2c94046792
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Oct 2 14:38:40 2014 +0200

    add some validations

commit 33a29a0bcd9f3f46eea0a00ec522575ee33ba51b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 2 14:36:01 2014 +0200

    remove autocommit, unique_checks and foreign_key_checks flags from dumps

commit b8e31d6068d05ca3608d87eac1a478345c841254
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 2 14:14:37 2014 +0200

    fixing license generator

commit c8efc277b203bcf16e37a86a6d74b25b81ac75c0
Merge: ec37fae c72a2bf
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Oct 2 14:03:29 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

commit ec37fae3fe81289fd18f7e463dbe250c46817f02
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Oct 2 14:03:25 2014 +0200

    delegation.feature fixed

commit c72a2bfcb1d99e77f34f9ab7357390396d844bcd
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 2 13:58:53 2014 +0200

    fixing license generator (wip)

commit 37b68f5704d83fa7ff78f608d81e1cd5fa23a267
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 2 12:56:31 2014 +0200

    fixing dataset

commit 8ce23c5e0d3586fde4e2fa82c652a42d31cd5751
Merge: 07ad0c0 bd75f4e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Oct 2 12:01:48 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

    Conflicts:
    	features/personas/dumps/minimal_seed.sql

commit bd75f4ef757736fb29a59811fac395c58fbf8cd8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 2 11:56:31 2014 +0200

    improve dataset

commit 07ad0c0ff512314424f2583c812ede930e84c077
Merge: b0d7ba9 5eb8e30
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Oct 2 11:53:19 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

commit b0d7ba975d736c9d9d3045262b2ddde7c199a244
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Oct 2 11:53:14 2014 +0200

    fix missing hand over for delegation with all assigned lines

commit 5eb8e30114f1208039541799042120992c7c7f73
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 2 11:41:49 2014 +0200

    exclude generating_personas.feature from CI check

commit 8b1217e017c89ea4c9f9d369a8d522584ebebee0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 2 11:31:08 2014 +0200

    [FIX CI]

commit ce85188bb3f0e05d9b602c3a650550495790e0aa
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 2 11:17:34 2014 +0200

    fixing package model generator

commit 7147a74efe57340e75d0669a9eece747a4f088aa
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 2 10:52:31 2014 +0200

    [FIX CI]

commit 498e6b553bb1f69539d62c3f4ffd61a5f2253d90
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Oct 2 10:25:49 2014 +0200

    [FIX CI]

commit ece30bf92247850d297d7907047334d4431c6ba0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 1 21:17:10 2014 +0200

    3 CI trials

commit df1184c48d37af0093f8a0c8e5be842339bce376
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 1 19:18:43 2014 +0200

    fixing items generator

commit 2652b95de4245e82a5a6703f34131d24061f5798
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Oct 1 16:42:40 2014 +0200

    fix eval helper

commit 093c094afff747d1156619b90ac3efc12728a61d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Oct 1 16:24:00 2014 +0200

    raise if not allowed eval string

commit 5a3f2df93888031e98dfe65bdddafb4b26fd459b
Merge: e162fa6 050aed6
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Oct 1 15:29:33 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

    Conflicts:
    	features/personas/dumps/minimal_seed.sql
    	features/personas/generating_personas_steps.rb

commit e162fa6385098ce35adf0caacad1327f5709fa2e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Oct 1 15:19:39 2014 +0200

    remove .blank?

commit 050aed641c61fe9ff8170a18da7ca36acd141c45
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 1 14:44:57 2014 +0200

    add missing lending_manager  access rights for Pius

commit 9ebaf5de0776de0c5efd5a55e036d72054de9ff5
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 1 14:37:43 2014 +0200

    [FIX CI]

commit 1341fa1d105679e23f6e89d0022eace47a3421a5
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 1 14:25:17 2014 +0200

    is_borrowable flag and minor changes

commit 72cfc605b547751d2c1597824bf48a31bb0cdb7a
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Oct 1 14:02:44 2014 +0200

    nilify

commit f53320c790b93e8913d8f2e3be5e24b590ef2fff
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 1 13:55:32 2014 +0200

    more total checks

commit eaf4b276cc2245051c142d6f9265b46138225f71
Merge: 80c8bf8 b7b9b56
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Oct 1 13:47:19 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

    Conflicts:
    	features/personas/generating_personas.feature

commit 80c8bf8759a367ef9fc2967e80f4b985f9cf8633
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Oct 1 13:40:10 2014 +0200

    lisa and all personas GONE

commit b7b9b566d43a40db4604e057c6751efaec9a8b4d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 1 13:39:01 2014 +0200

    fix typo

commit a8280c61a35d92091a1486c9e47eb3310c310671
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 1 13:38:41 2014 +0200

    more total checks

commit 931b6726cacc61ac3d3fe9d7f21f5d04e5920a64
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 1 13:31:42 2014 +0200

    remove binding.pry

commit bd87cf45338641437d3cc711d597949823a24cf8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 1 13:29:45 2014 +0200

    more total checks

commit b063326daf4248e6f4081bcaccf7d29b3b4bc4e7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Oct 1 13:28:01 2014 +0200

    lisa wip

commit 3a60ef48542e4d3a015c05d6f2b5d8174a6f56b7
Merge: 1c9a4dd bd5603c
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Oct 1 13:13:00 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

    Conflicts:
    	features/personas/dumps/minimal_seed.sql

commit 1c9a4dd32b1628fd5e184ff756765d5628215595
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Oct 1 13:12:10 2014 +0200

    lisa soft overbooking

commit bd5603c2b344595da858893ac0d7d5f40489a88c
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Oct 1 12:21:31 2014 +0200

    introducing total check steps

commit 45f4c3e9c08885e2407571d92c07141ddf4a3fe1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Oct 1 11:20:30 2014 +0200

    andi GONE

commit c7b6a673ac23184dd0a2497f29a50ff21403578e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Oct 1 10:59:20 2014 +0200

    andi wip

commit c21dfa3a7fab6a2a75e8876db4389c3cdeac0359
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Oct 1 10:28:23 2014 +0200

    andi wip

commit 147f2e6c9292da1ac012a416b7391bf9b96fdce3
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Oct 1 09:47:55 2014 +0200

    andi wip

commit 6da34e23df0f96e69d2b599ff762eba8deb56be8
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 17:32:56 2014 +0200

    andi wip

commit 91dedb608ab42aa0de1ce2b1e7098d3e94894f2f
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 17:27:18 2014 +0200

    Fix partial matches in regex

commit 1c5de438e9babd730a29f0adc0845008e7e48422
Merge: ef68319 74837c5
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 16:34:22 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

    Conflicts:
    	features/personas/dumps/minimal_seed.sql

commit ef6831986ab3126aa8dafdbdf91cd33b5b7b40d7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 16:33:37 2014 +0200

    petra GONE

commit 74837c535ad8840ec5da08ba1fa7c0ef2e06ac02
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 30 16:30:28 2014 +0200

    1 auto trial for CI

commit 759f76e825d80f489c460603e21d7d67e486a13b
Merge: b29f871 01e01b7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 16:25:26 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

    Conflicts:
    	features/personas/dumps/minimal_seed.sql

commit b29f8713ffec82a812dead32eaabba0d61a7b0c6
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 16:24:56 2014 +0200

    petra wip

commit 01e01b7bbe8bef17d842e41fd210ec0982bffa3a
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 30 16:15:44 2014 +0200

    regenerated dumps

commit 5ec4e3b59de8e6c2733be37165f8c0523feeb4c3
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 30 16:14:30 2014 +0200

    fixing timecop freezing error

commit 582fcbbe1ea7062f413fca7b818b4a1174e731de
Merge: b1808f7 e4426fd
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 16:11:20 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

    Conflicts:
    	features/personas/dumps/minimal_seed.sql
    	features/personas/generating_personas.feature

commit b1808f77142f0cde00e5cb4196aecbfb102a6323
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 16:02:51 2014 +0200

    petra first contract

commit e4426fd6eeb5e3c6a62b5aa462d02775fafd05a0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 30 16:01:18 2014 +0200

    normin is gone

commit d851ef2136407119042f7759fe23bb987a282a3b
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 15:44:21 2014 +0200

    pius GONE

commit 00c3470556195d97b1bc83c67fb60c9e295ca7f0
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 15:43:55 2014 +0200

    another closed contract from pius

commit bbd18ba0bb09976d037674a5946f4f3032a39781
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 15:31:58 2014 +0200

    remove duplicated code

commit 0ea8471765381d9a635590e620ca8dab7340f032
Merge: c97c083 0a076a5
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 15:26:41 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

commit c97c083c6fd090a72a66b11027ac8f3bc0da7b31
Merge: f635647 cc97490
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 15:26:12 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

    Conflicts:
    	features/personas/dumps/minimal_seed.sql
    	features/personas/generating_personas.feature

commit 0a076a5e7e7fbc8a2aa9f465a32451b5cc9bc9ec
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 30 15:24:45 2014 +0200

    wip normin

commit f635647a0ad9f7f9e2196425c27c9bd69c264a85
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 15:15:11 2014 +0200

    closed contract from pius

commit cc974904ecc0794805644d72ef8866defbf37ea7
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 30 15:10:28 2014 +0200

    wip normin

commit ac16356be989ad6ac5752761b9e96bd28e8d9f82
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 30 14:58:42 2014 +0200

    wip normin

commit 7a9dcfe87e283d4a6d31a4b7ae341a1801bd0aba
Merge: 591cf7c 8b171ce
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 14:19:24 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

    Conflicts:
    	features/personas/dumps/minimal_seed.sql

commit 591cf7c39f34b91d5a9be93a8be2e2d336bae559
Merge: b81f07a 9e0f4c5
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 14:18:38 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

    Conflicts:
    	features/personas/dumps/minimal_seed.sql

commit 8b171cee3ae849350085580522d3b518c4ab97a8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 30 14:17:03 2014 +0200

    wip normin

commit b81f07a66c9672a42d7bc90362572dbd2bbd5472
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 14:16:51 2014 +0200

    remove unnecessary users

commit 9e0f4c5b0cd64bc58e1f79df379ca4f2c6fffd9d
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 30 14:06:57 2014 +0200

    wip normin

commit e29dd58ac7edb8c39c04262ad4e2addbfa2491a8
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 13:59:09 2014 +0200

    overdue take backs from pius

commit 074db3bba64d82b1fb824316bd0c5e76ac6c7f15
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 13:46:21 2014 +0200

    contract with license line

commit 4f3cbd5e1d7323dc28b336fc4b803cef2a2e4fe6
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 30 12:51:24 2014 +0200

    more on generating contracts

commit 8a9eabf015aa82bcebfb88dbc3291b8271f55ea4
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 12:16:21 2014 +0200

    add new signed contract from pius

commit 9efba222adb2006be8e3e837770bfd21bec0d013
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Sep 30 11:52:22 2014 +0200

    merging steps

commit 90510fb56e4b1219daa701f49bccc4142340f8ac
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 11:41:52 2014 +0200

    contracts with option lines

commit cdcdbbe1acb847471b01b99e810792b3033968c1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 11:02:35 2014 +0200

    adapt one contract to new generation process

commit ed71728e47fa560791f524f3990191f79ece0200
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 30 10:57:28 2014 +0200

    fix one contract

commit e7c04a044ee8d36348a6fc753c706b66d3a8e8f8
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 29 15:46:38 2014 +0200

    remove table problem with | | |

commit 99226c12147b31c0b7c88e2cb1c57963bf877bc6
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 29 15:00:25 2014 +0200

    minor changes

commit 79846da06282ab55c32b604a53c6e3bc531342cf
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 29 14:52:45 2014 +0200

    julie gone

commit a47ebbc5bb199a0116eea1a11f596b685ef17227
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 29 13:34:32 2014 +0200

    everting overwritten categories models (again) and delegations

commit 8bd9544d9866a08643fb1e484b099aa297f47b29
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 29 13:07:07 2014 +0200

    pius wip

commit f9f2290afdae6dd7b275bac01c21a5c4a4232bcc
Merge: 9d024db 65f2a8b
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 29 12:34:58 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

commit 9d024db8b822ee20d28b575202e925a0c23f9d67
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 29 12:34:52 2014 +0200

    pius wip

commit 65f2a8bb2df6b5dfb148eeb6e4b80dea8ccbe57e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 29 12:20:58 2014 +0200

    creating groups and reverting overwritten categories models

commit f1cf6d142cdd37aade64fd820d60846b614795a1
Merge: 1446c00 755092f
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 29 12:17:29 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

    Conflicts:
    	features/personas/generating_personas.feature

commit 1446c0041ccf76e9343cdcdbc81c8af357726ddf
Merge: 49dd350 d181db8
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 29 12:10:38 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

    Conflicts:
    	features/personas/generating_personas.feature

commit 755092fe3f05d6490d4f759e8eeff97782c78822
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 29 12:07:30 2014 +0200

    wip julie, lisa, normin, petra

commit 49dd350871e1dbf79063795b9a3a0b55958a3b34
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 29 12:05:19 2014 +0200

    pius wip

commit d181db8843ec9ec19def0bfb5f17572759ad3c09
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 29 11:45:06 2014 +0200

    mina gone, andi wip

commit 97cc33871475e770c6bfe7c7a6500ec6a384d018
Merge: dc501c0 7668751
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 29 11:34:50 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

    Conflicts:
    	features/personas/dumps/minimal_seed.sql

commit dc501c06b9b6e0dcdf91b2a30af5b5defaef799f
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Sep 29 11:34:02 2014 +0200

    wip

commit 7668751013a296ac33e096080c77d2118f61ead9
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Sep 29 11:12:23 2014 +0200

    categories models associations

commit 3ddc0e4ecb94e080aa553e91326ccba75f0f53d5
Merge: 8ba1271 1028a9c
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 26 16:38:16 2014 +0200

    Merge branch 'master' into fs_personas

commit 8ba127130c45fbfc072b990d44537652e32c1efa
Merge: bd6778a 5503817
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 26 16:36:26 2014 +0200

    Merge branch 'fs_personas' of github.com:zhdk/leihs into fs_personas

commit bd6778ae96707d7f038661b39d5d3c9c76868817
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 26 16:36:12 2014 +0200

    mike DONE

commit af3da55f3d63e90f5f5c23f09983e0c7fd030352
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 26 16:26:17 2014 +0200

    licenses wip

commit 6b2a7d497f3a8487921884e22d6c63b7c21d5e28
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 26 16:26:04 2014 +0200

    eval helpers module

commit 55038174ce4ca4ec050e1ab5b0a50a91b9dd4eb5
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 26 16:04:11 2014 +0200

    - keep srand back again and removing Array#shuffle/sample extensions (get a try)
    - make possible to define multiple datasets with different test datetimes

commit 209d3c5609a89521a4dce35650e3a3002ebd31e3
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Sep 26 14:41:41 2014 +0200

    major refactoring of Persona module to Dataset

commit f45f5e9332e1a1c2d87bc1957ab8f49d81848015
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 26 13:38:31 2014 +0200

    eval($2).to_s

commit 897a532f23f1af5361122ac9a2d0fccd33c047aa
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Sep 26 13:09:32 2014 +0200

    more mike

commit 6e5e2f8c052dbed5103cf9b7d9ab16c568415813
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 25 15:20:37 2014 +0200

    remove binding.pry

commit 27a4b942fd1fc7ad3cd674fc18f437872c0f0f5d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 25 15:15:39 2014 +0200

    secure eval

commit a3e25f8a2b0d1e745422f63262d41ff6d3e33fa1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 25 14:56:06 2014 +0200

    hashes_with_evaled_values

commit f28c0bf5aa96eff51f8bf09a78e16ff938a1ea49
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 25 11:48:53 2014 +0200

    mike wip

commit 29054e2894cd028ac62ee8dd1d4ac47f3127431e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 24 18:06:32 2014 +0200

    mike wip

commit 7c919f7d52292281685c059b2ad69fc8331c5b8e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 24 15:11:04 2014 +0200

    mike wip

commit c8a1b2fe89302232273190a55e2d5ac97afbdd86
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 24 13:57:30 2014 +0200

    matti gone

commit 3494ad89fafc9614168b5317b2fc2c9a630de83e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Sep 24 12:08:59 2014 +0200

    buildings and locations

commit d62cc53c9d69ff3699e21c35c10e9442623ab760
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Sep 24 11:47:35 2014 +0200

    refactoring personas sql dump generator to cucumber scenario