Squashed commit of the following:

commit d065fa6741d8c51445730f836b69c55af629b071
Merge: 1d05869 370eef5
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Jan 28 10:38:06 2014 +0100

    Merge branch 'fs_verify' into mk_login_using_rack_session

commit 1d0586941141f0ec65052b10ccc0b165d51318b7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Jan 28 10:37:32 2014 +0100

    [FIX CI] borrow/kalendar6.feature

commit 37e653867197b14c81842cf676d7841f22cd6c19
Merge: 5373dd8 7da6cfb
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Jan 27 16:42:48 2014 +0100

    Merge branch 'fs_verify' into mk_login_using_rack_session

    Conflicts:
    	app/assets/javascripts/manage/controllers/inventory_index_controller.coffee
    	app/assets/javascripts/manage/controllers/take_back_controller.coffee
    	app/assets/javascripts/manage/models/user.coffee
    	app/assets/javascripts/models/user.coffee
    	app/assets/stylesheets/components/booking-calendar.sass
    	app/controllers/authenticator/zhdk_controller.rb
    	app/models/item_modules/filter.rb
    	app/models/mailer/user.rb
    	app/models/model_modules/filter.rb
    	app/models/setting.rb
    	app/models/user.rb
    	app/views/staging/_deploy_information.html.haml
    	db/structure.sql
    	db/structure_with_views.sql
    	domina/execution/feature_tasks.yml
    	domina/execution/features/benutzerverwaltung_features.yml
    	domina/execution/features/diverse_features.yml
    	features/examples/benutzerverwaltung11.feature
    	features/examples/gegenstand_editieren.feature
    	features/examples/gegenstand_editieren3.feature
    	features/examples/gegenstand_erstellen4.feature
    	features/examples/gruppen4.feature
    	features/examples/inventar.feature
    	features/examples/inventar2.feature
    	features/examples/modell3.feature
    	features/examples/modell6.feature
    	features/examples/pakete.feature
    	features/examples/pakete2.feature
    	features/examples/passwort.feature
    	features/examples/passwort2.feature
    	features/examples/passwort3.feature
    	features/examples/passwort4.feature
    	features/examples/probleme.feature
    	features/examples/vertrag.feature
    	features/examples/werteliste.feature
    	features/examples/werteliste3.feature
    	features/step_definitions/examples/ausleihe_steps.rb
    	features/step_definitions/examples/inventarhelfer_steps.rb
    	features/step_definitions/examples/modell_steps.rb
    	features/step_definitions/examples/zweck_steps.rb
    	features/step_definitions/login_steps.rb

commit 5373dd8de7ed395c2de9f0868955f4fe588831bd
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 13:40:30 2013 +0100

    [DOMINA] change diverse_features.yml

commit 2bf2b9b3becfb4410be161484162becf4f4d7b7b
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 13:04:21 2013 +0100

    [DOMINA] change diverse_features.yml

commit c88895fbdab342c3b0ba68446b796a7d86c5ec3f
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 12:59:27 2013 +0100

    FIX CI: increase sleep time as a try to fix ci

commit 36e17874c3fb7210aeee375ffb5f026d54784cbe
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 12:58:24 2013 +0100

    [DOMINA] narrow down benutzerverwaltung_features.yml

commit df734cefb407e91726046217d0c0bcf207c68732
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 12:48:29 2013 +0100

    FIX CI: split up more benutzerverwaltung*.features

commit 32aa707342bf9a7bb3654a28f7252e44bc54cc04
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 12:39:48 2013 +0100

    FIX CI: modell6.feature try another fix

commit e88b6e12b83cb15efc02f4dad95ad54d42f06a08
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Nov 19 12:23:17 2013 +0100

    [FIX CI] approve_order_model.feature

commit 2ddad8a5e0dad740ca060b83e8d14803ef2c28b1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 12:00:19 2013 +0100

    FIX CI: modell6.feature try fix

commit e1891a4e5c4953dda01ef9999b5f20e1b83d22a8
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Nov 19 11:40:09 2013 +0100

    Fixing the settings migrations, they need to work on the singleton, not
    create a new one.

commit e53214028c0de6001f85fa5f43d273a7e2bc6689
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 11:39:33 2013 +0100

    FIX CI: modell*.feature

commit 3f3eb455d094957cc06498714a773e75131f3736
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 11:38:46 2013 +0100

    [FIX] too much recursions problem when working with modal dialogs

commit 18b42755b3ab9c400f628f2034aa9ecec6b65152
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 10:52:29 2013 +0100

    [FIX] booking calendar days only red on closed day when start or end date

commit 1ab4988adf1a5755d3acc633771cc62ca85652ad
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 10:50:18 2013 +0100

    [FIX] assign autocomplete should also show items without buildings

commit 128c806c37dc743086672d1bb5cc1855ff95f563
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 10:47:52 2013 +0100

    [FIX] some css fixes

commit 562e999523e40af75d982ee72da955fc01981b83
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 10:47:43 2013 +0100

    [FIX] allow not numeric unique_ids for users

commit 5584eb8c45c54d3fdacf84b555f2be2170f3f9ff
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 10:44:20 2013 +0100

    some deploy information visual fix

commit 5cf1d35ef5da79c320ad8a29bba304cf9908d7d1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 10:50:04 2013 +0100

    [DOMINA] test only modell features in specific_features.yml

commit b9eed07e643b74c1466d50185cc9623d7f2c2609
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Nov 19 10:46:24 2013 +0100

    FIX CI: modell2.feature

commit eb6c0b4aeab2e60da7b42063fcde71b84172f809
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Nov 19 09:34:10 2013 +0100

    [FIX] Load the mailer settings properly in reject.feature

commit abaaa0eff2585afa6199390e2e43110f523fd4ee
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 09:00:17 2013 +0100

    [FIX] split gegenstand_kopieren.feature

commit e524d9cb15533ebaffed767347e0b079afceea0f
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 08:58:45 2013 +0100

    [FIX] split gegenstand_erstellen.feature

commit 2c7ddb44efd1d74adaacb1836ce3a2668553f452
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 08:57:03 2013 +0100

    [FIX] split gegenstand_editieren.feature

commit 978ed7c0d050ec0e7dda15ba58460497009bb697
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 08:56:10 2013 +0100

    [FIX] gegenstand_ausmuster2.feature

commit 38c4eb4beaa24014dff8e7b3e137e28e4e31340c
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 08:55:10 2013 +0100

    [FIX] split more benutzerverwaltung features

commit a6032056db1b80e665a0a55bcd7b9b55ae2dc9ab
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 08:54:19 2013 +0100

    [FIX] split more benutzerverwalten.features

commit ae753e0eef7bee47227c5120d7266cb8ef14be90
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 08:52:35 2013 +0100

    [FIX] split suche.feature

commit 65fb509b21379db456ea19ad0d668e0046c28840
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Nov 19 08:38:33 2013 +0100

    Checking in correct structure SQL

commit 1099b6763e0d8481f09ad738671df056e63cb4b8
Author: Sebastian Pape <github@pape.io>
Date:   Tue Nov 19 08:37:29 2013 +0100

    [FIX] modell2.feature

commit 9670b0cbf1f8b557dbfbb422e5f12fc4d2a59495
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Nov 19 01:00:31 2013 +0100

    [FIX CI] features/examples/geraetepark_administrieren.feature:55 ; features/examples/gruppen.feature:27 ; features/examples/gruppen2.feature:14 ; features/examples/inventarhelfer.feature:53 ; features/examples/zweck.feature:19

commit 29ddaccfdac4a68cdd2aae763c5bda08b9f65c34
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 17:22:18 2013 +0100

    adapt diverse_feature tasks

commit c186ed337f84e1828326b0d5a58111dc5e41561d
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 17:20:43 2013 +0100

    [FIX] split pakete.feature

commit 8b5fcbbae05242f0410dffed0b8750fa195d2d75
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 17:18:51 2013 +0100

    [FIX] split passwort.feature

commit ca480ed3f5807123daec80ba29e78814703b0af8
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 17:16:45 2013 +0100

    [FIX] split probleme.feature

commit 427122fbf69589f9c544a840661341a1c2d57ae4
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 17:15:23 2013 +0100

    [FIX] split vertrag3.feature

commit ff3cdae121ff179e57babaac1d9ea40235f5519e
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 17:13:47 2013 +0100

    [FIX] zweck.feature

commit ff3db6784b27b28789ab4464e59b4990e0640722
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 17:10:42 2013 +0100

    [FIX] split inventar feature

commit 84fc5f3f0c97a1318bdca7fec6f264ba6b6bd51e
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 17:07:35 2013 +0100

    [FIX] explorative_suche2.feature

commit 144caeba60258eb4abfdfd05b9ee011d167c4fdb
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 17:01:08 2013 +0100

    FIX CI: split up more modell*.feature

commit a2e64595151383e8526a0974c81d51199a539680
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 16:43:32 2013 +0100

    FIX CI: split up more modell*.feature

commit 4accfa5d1f11527624551d897411be1593437b1a
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Mon Nov 18 16:37:48 2013 +0100

    Initialize SMTP/mail delivery settings from database instead of configuration file.

commit d8e04e120ed7d6d3509ea48a320fe5230383baa9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 16:12:46 2013 +0100

    [DOMINA] remove green features out of diverse_features.yml

commit 83613701132b9ff3374fe1a8d90bc5e59cbd185e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Nov 18 16:07:46 2013 +0100

    [FIX CI] splitting features/examples/passwort.feature (yml definition)

commit 2f2746dbaf32aa79b9d69f06d34e5c5775c2bcfb
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 16:04:22 2013 +0100

    [FIX] ausleihe.feature

commit 8c0a12f1c81be673d92ddd0eb7a8247cc94967aa
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 16:03:39 2013 +0100

    FIX CI: split up modell.feature

commit 6d2438358d031b200cb16249843d7032277213df
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 16:02:30 2013 +0100

    [FIX] sprachauswahl.feature

commit 1187ad96b92a8256179935d594f252e06c545e86
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Nov 18 16:01:45 2013 +0100

    [FIX CI] features/examples/gegenstand_kopieren2.feature

commit 7acaef37e5fcbadec1bfeb82d980e5101831a675
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 15:56:14 2013 +0100

    [FIX] timeline.feature

commit 46748261afa4097f738a0f46a8a029478e7f10fd
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 15:55:34 2013 +0100

    FIX CI: gruppen*.feature

commit ad70f5667a81f8cd4e1df9e968d0774c5e6f77c5
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 15:54:07 2013 +0100

    update task list

commit 4d9471d2473e98a5fc13b97f5eff0ccfd893c815
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 15:52:49 2013 +0100

    [FIX] split vertrag.feature

commit 53e0b6762d25d8c4a657ea9104a012da4f6775b0
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 15:52:07 2013 +0100

    [FIX] split werteliste.feature

commit d20b36a7341cce261313268065c592458c1c01b1
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 15:49:12 2013 +0100

    [FIX] zweck.feature

commit ac87366eb2e009ad0b2f8e99f112d17246c45612
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 15:43:33 2013 +0100

    prevent showing default title when tooltip is showing up

commit 3415fbbea4277a85bf33d9851cda379556dc9f91
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Nov 18 15:33:01 2013 +0100

    [FIX CI] splitting features/examples/passwort.feature

commit 590cece1588070291a79bb75c62209647c0ceee5
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Nov 18 15:28:11 2013 +0100

    [FIX CI] features/examples/modell.feature

commit 2cee382b0aba437fd969a85e19f7e18b59999422
Author: Sebastian Pape <github@pape.io>
Date:   Mon Nov 18 14:51:58 2013 +0100

    [FIX] consistent flash messages (green for created/saved)

commit 8965ab1f59b541901b68244c09c12c7a5e4a151c
Merge: 55c2926 3d22fbb
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Nov 18 14:54:33 2013 +0100

    Merge branch 'next' into mk_login_using_rack_session

    Conflicts:
    	features/login/login.feature
    	features/step_definitions/login_steps.rb
    	features/support/env.rb

commit 55c2926664b55d05114331da44e42b60c937edc5
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Sep 24 15:15:04 2013 +0200

    Tests for normal web login

commit 9ce01473cf30461e4f1190501d8d545f013554c1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Sep 19 11:38:17 2013 +0200

    login using rack session