Squashed commit of the following:

commit bb4ab3d34745dc9e399dadddc1fddf7999322e48
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 9 16:54:31 2014 +0200

    [BUGFIX] asset_path for logo on splash screen

commit d62f50d5f9f8c0cc8c4c188bc61b0b893c572fff
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 9 15:58:57 2014 +0200

    [DOMINA] updated feature_tasks.yml

commit 5f19a4fe81b623df847df4db6f1367bdbc0ab7f9
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Apr 9 15:34:13 2014 +0200

    Make sure the tmp directory exists.

commit 5782e46a5e12e0b3a6027155f036ee25ae4c523c
Author: nadjaweisskopf <nadja.weisskopf@zhdk.ch>
Date:   Wed Apr 9 15:09:59 2014 +0200

    [#69177404] Software-Inventarliste

commit 35bb973f31a9bb81b78725148907a575f9dd9b0d
Author: nadjaweisskopf <nadja.weisskopf@zhdk.ch>
Date:   Wed Apr 9 14:51:26 2014 +0200

    [#69176406] SW-erstellen

commit 25e959cde5ee15ecc280bbf4a52572d701a1921e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 8 16:39:55 2014 +0200

    [FIX] remove duplicate ids from ajax params

commit f9059de80ec40dd6d41ffaf1dd197792400c8a5b
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 8 15:36:57 2014 +0200

    [TEST] remove binding.pry

commit b37af10311085ce738e120cc10bc348f31d00fad
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 8 14:45:00 2014 +0200

    [DOMINA] updated diverse_features.yml

commit 157b9395badb308212c7e1784337d38f1eb2e372
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 8 14:40:32 2014 +0200

    [FIX] localize suspended_until only if present

commit c3f377cdbd66790a1d2c7a3247ec3c2ec621cb79
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 8 13:33:46 2014 +0200

    [DOMINA] add space in commands

commit c5bdea743fe6b76d3f312a404053834701f2e0c8
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 8 13:32:35 2014 +0200

    [RAKE FIX] generate structure with views with db drop create and migrate

commit 404e3f881b66b06e8a79c7a509999d4799c1042d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 8 12:03:19 2014 +0200

    update structure_with_views.sql

commit d47d1ffaa718781beb8e92c6d1c4a888fa69431e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 8 11:30:55 2014 +0200

    [FIX] asset_path for logo

commit a007d531dc73e9d5575b1e2afdd6830fdbf56b76
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Apr 8 10:45:54 2014 +0200

    Give a temp dir that makes sense.

commit 1c33f3c0051c64df90d241c59bfa6e514638278e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Apr 7 17:05:02 2014 +0200

    [#68170636] hslu auth controller: don't give access rights to all pools automatically

commit f08bfe227bc7c0eb0eb6fc77953f70ebcd6cbce0
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Apr 7 17:03:07 2014 +0200

    fix date format for suspended until

commit 586057b9495bdd09571845f1674589597d5abfb1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Apr 7 16:44:15 2014 +0200

    fix translation for automatic access

commit a7ba0a5f2e7a0d72269fb7d057c304af4528efbb
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Apr 7 16:40:37 2014 +0200

    [#68170636] rspec test for ldap controller

commit c206f811f2676c4ee4bd077e492348523b4a802c
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Apr 7 14:14:46 2014 +0200

    [#64817854] show settings instance address in contract

commit 485347e9946075072c7d653735145a5696f16882
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Sun Apr 6 23:23:26 2014 +0200

    #68170636 fix wrong indentation

commit 01d4f7bb8f48395886c0eab98f686ed65512852c
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Sun Apr 6 22:59:14 2014 +0200

    #68170636 merging fs_automatic_access_ip for demo

commit 6d302f1399b184a91164a742dae4decefeed9337
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Apr 4 16:43:01 2014 +0200

    [DOMINA] make a new commit in order to bypass the unique execution id constraint

commit 7fde00ab66acebdbdd43305edbf18716886a3d21
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Apr 4 16:32:20 2014 +0200

    [FEATURE #62691666] automatic suspension for late take backs

commit ab3010f0514d7c7698094a5ec015859b3e0b8e73
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 2 16:31:38 2014 +0200

    [DOMINA] updated rspec_tasks.yml

commit cdd9eaf5285f0ba7278efeb72e1e04fdfbfe0528
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 2 14:57:39 2014 +0200

    remove binding.pry

commit b6fb261fe78ccfd89850e7ef5de6e589a5e469c2
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 2 14:38:55 2014 +0200

    [#33044661] test implemented

commit 58413aa84e19c98efd27e9b02a406475c8c3ae52
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 2 14:13:07 2014 +0200

    [#33044661] remove trailing comma and white space from user address in contract

commit 4353fbfe4404efaac890c9c5eb5542e452dd9247
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 2 12:25:28 2014 +0200

    upgrading to Rails 4.0.4, upgrading gems and fixing ci

    Squashed commit of the following:

    commit a6749d983cd5ddcaf96b953b60c08d0a2cab74f8
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Wed Apr 2 12:24:54 2014 +0200

        [FIX CI]

    commit 8e975bba8ed0c25d6e89c51dd7b7f69f8a228ad6
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Tue Apr 1 16:54:09 2014 +0200

        [FIX CI] capybara dom

    commit d753fe6a80dc8915975219539762e3ba64b8ddfa
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Tue Apr 1 16:49:26 2014 +0200

        [FIX CI] jump to the next availability change date

    commit 3a5b6f86afa86ba414057f2d2726aae190cbb6d2
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Tue Apr 1 14:43:40 2014 +0200

        downgrade font-awesome-rails gem and removing thin gem

    commit 482086dfb19e790ad51eedb5399aae308ed57ec3
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Mar 31 18:39:36 2014 +0200

        downgrade jquery-rails gem

    commit d3e74d5cfae2284cefdc82fad1e79e2991cc4c17
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Mar 31 18:31:47 2014 +0200

        removing deprecation warning

    commit ce99fabd9fb8117d2eb91263f8aac3d358bd76a0
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Mar 31 18:21:15 2014 +0200

        downgrade jquery-rails gem

    commit fcccfc2a55887ada9ecbc45fe1f67dfde5e558eb
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Mar 31 18:13:34 2014 +0200

        downgrade paperclip gem

    commit 15f904f469a9473770d76adbdea5c85387b0f5a3
    Author: Franco Sellitto <franco.sellitto@zhdk.ch>
    Date:   Mon Mar 31 18:03:14 2014 +0200

        upgrading to Rails 4.0.4 and upgrading gems

commit bc256c2a587db194dc12304b0edc40c9aed4d5b2
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Mar 31 17:24:31 2014 +0200

    [BUGFIX] upgrading to Rails 4: asset precompile for simile timeline

commit 331cfff107041b8c49154cbc9b9da4df692ce9f7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Mar 31 15:37:09 2014 +0200

    Revert "[BUGFIX] proper precompilation of timeline assets"

    This reverts commit 2455ff9b4b80e1e0c6f5c1eb410ba947cad94ede.

commit 2455ff9b4b80e1e0c6f5c1eb410ba947cad94ede
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Mon Mar 31 15:09:01 2014 +0200

    [BUGFIX] proper precompilation of timeline assets

commit 4ea6831c728568c72fcbbc36b056b5f60c6b27d9
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Mar 27 16:34:42 2014 +0100

    Making LDAP config path configurable again.

commit 3ae9a5b93882d8aefda081bd80e5d9ddcd3d4992
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Mar 27 10:40:42 2014 +0100

    More solid error messages, hardcoding LDAP config file location.

commit 4263332404f2dbe21677653f8b702ce516478981
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Mar 26 15:22:41 2014 +0100

    Add secret key base.

commit c18400ccf246f3f0028979b9a8d1c6ac0ebad8a7
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Mar 26 14:53:45 2014 +0100

    Cleaning up some dead code.

commit 4e240be793fe4fe39bfa7b1a2fdd24508205827c
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Mar 26 14:50:16 2014 +0100

    Working generic LDAP adapter.

commit 743a6a63066738ede00a8282ef8eaa882a53189e
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Mar 26 13:56:28 2014 +0100

    Generic LDAP controller works, TODO: admin group membership.

commit 8acd71dedc6140bb19f9612c60e26322577534ca
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Mar 25 17:32:11 2014 +0100

    Forgot that file.

commit feab77bb3a0553e15b8365428dbc16f84ec778b8
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Mar 25 17:14:40 2014 +0100

    No need to list port twice.

commit 6fe1d8c6d83570454b7e6e028ffaf75ed798da72
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Mar 25 17:06:57 2014 +0100

    LDAP, wheeee.

commit 41c5b1db4ee8468d888bbc9bcc682da00d4b817e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri Mar 28 16:48:34 2014 +0100

    [TEST] make model factory use better Faker names

commit 63db7c05c6108efc43649ebec4d6684af6512516
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Fri Mar 28 11:05:19 2014 +0100

    Drop Faker in production.

commit f5a16e475b0d5f82b1b61802f422877c145e90c8
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Fri Mar 28 10:13:43 2014 +0100

    Removing deprecation warning about i18n.

commit 0d35e42091bd1ce2bc9e447a9db019065e94a8ed
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Mar 27 17:49:53 2014 +0100

    Deploy using Ruby 2.1.0 in production.

commit 30605a9278a29d013468a3809df634d8c2e1453c
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Mar 27 15:45:36 2014 +0100

    [FIX CI] features/examples/geraetepark_grundinformationen3.feature:30 @upcoming

commit d120ba0bfbf626f3ad01f8ae6446fa17f2dccf2a
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Thu Mar 27 15:42:10 2014 +0100

    Config linking: Damn, you so stupid.

commit a743f9523e328cc86bf222e37c7255d88a234044
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Mar 27 13:32:33 2014 +0100

    [DEPRECATION] update secret token

commit e642a1d71880717621b8f43d101272656808973b
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Mar 27 12:44:51 2014 +0100

    [FIX CI] comment out not yet implemented steps

commit 10824a475c4cc3c59a1b547224592d5334dc0438
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Mar 27 12:18:28 2014 +0100

    [DEPRECATION] act-as-dag gem from github with rails4 patches

commit ce8c7eb075c86821d15fe74a5287f31890e4bab9
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Mar 27 10:32:09 2014 +0100

    [DEPRECATION] change count(distinct: true) to distinct.count

commit 2bc1807501e53ec954576a7b84acd97ba102ef49
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Thu Mar 27 10:08:36 2014 +0100

    [DEPRACATION] default scope uses block instead of lambda

commit 8c055b91e15c1f4f375fa2509223f9283b1c3855
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Mar 26 18:04:27 2014 +0100

    [#64817854] partial test implementation

commit dbae923181f256fbc4554c7b67e6edd92fde6697
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Wed Mar 26 15:48:22 2014 +0100

    That option shouldn't be necessary anymore.

commit b990cb148db26ac2c8fad0e5bf42915c1e037304
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Mar 26 14:11:54 2014 +0100

    [#68186532] adjusted error message
[BUGFIX #69344348] Show customer address only if the customer has an address.
Merge branch 'master' into next

Conflicts:
	Gemfile.lock
	app/controllers/authenticator/ldap_authentication_controller.rb
	app/models/user.rb
	config/deploy/production.rb
	config/deploy/recipes/bundle_install.rb
	db/structure.sql
	db/structure_with_views.sql
	domina/execution/features/diverse_features.yml
	domina/lib/domina/database.rb
	factories/model_factory.rb
	features/examples/Software-erfassen.feature
	lib/tasks/app/test.rake
	spec/controllers/ldap_controller_spec.rb
[FIX CI] modell5.feature lazy load request problem
[HOTFIX] take back using barcode scanner
Merge branch 'master' into next
[#68517412] FIX: dont allow to change start date for option lines in case of take back

Squashed commit of the following:

commit 6b84a092aa3f32d6f88f34e0445a2666bc4fed01
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Apr 25 16:26:50 2014 +0200

    test for not allowing to change start date for option lines in case of take back

commit 666d27d843ef4ad24dc5d79ea2b7c2ae289d28b7
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 23 13:24:44 2014 +0200

    FIX: dont allow to change start date for option lines in case of take back
[#68517412] migration fixing signed contracts
target_type preparation for fields
rename feature
reuse content_for :title in view
fix inventory field helper
fix tests
updated feature tasks yml
create new software license - first working frontend draft
create new software model
translations
activation type & license type as properties
introducing Software model as subclass of Model model
Item#type