fix deployment to production
[#81766400] [#81588944] [#82847794] error messages on booking calendar
[#71641296] reduced daily view
[#81940714] software license maintenance currency and amount fields

Squashed commit of the following:

commit a9dfc27cf13c4597e27c9e26bc6d66593b9a78d2
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Dec 5 11:10:53 2014 +0100

    fix previous change

commit 8877978f4b68ec6d87f65726c67e14059362d5cc
Merge: 3aeb4d6 baa2667
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Dec 5 11:07:55 2014 +0100

    Merge remote-tracking branch 'origin/master' into fs_81940714_maintenance_currency_and_amount

commit 3aeb4d6f370e3bc7f3897e31c1b9a03e9bbbc482
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Dec 5 11:07:15 2014 +0100

    [FIX CI]

commit 5c8ee8f79be54c64d0b76d002a6f9d1e155f6f97
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Dec 5 10:49:37 2014 +0100

    reservation_advance_days and reached_max_visits backend validations

commit ba909cfa747f8c208afb174bd465d42fa72291bd
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Dec 4 14:17:16 2014 +0100

    implementing steps for error messages on booking calendar

commit 9227c87ad61580677146ed9a34075ecaf681f5ef
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Dec 4 12:18:58 2014 +0100

    [#82841382] implementing steps

commit 2fe04206f08d1cbd57e6478637bb9f206f262844
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Dec 3 21:41:02 2014 +0100

    revert small change

commit bf3283604fdcf2e5993918a4bca61d3f14c85e2f
Merge: b5697f1 73dc52f
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Dec 3 21:34:34 2014 +0100

    Merge branch 'master' into fs_81940714_maintenance_currency_and_amount

commit b5697f107879aa6527b4b0ed6c489d2f2396bcdc
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Dec 3 17:06:27 2014 +0100

    [FIX CI]

commit 8b98c2b8f9f911cfaac95ecf5c8a99798f40a0b6
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Dec 3 14:01:31 2014 +0100

    regenerated dumps

commit 05b03924fdc5f736298166323152bed96c58d9cc
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Dec 3 12:13:54 2014 +0100

    [FIX CI]

commit 1ad14c05f04074f8daffb9694a88fb2553f9adab
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Dec 3 10:54:25 2014 +0100

    adapting scenarios

commit 0488896249a4ae3d9fafda47c33709f340fb9582
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Dec 3 10:44:03 2014 +0100

    [FIX CI]

commit e1ea4b130fd15b394036029e50c31ae42c540bb4
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Dec 2 08:56:50 2014 +0100

    renaming maintenance properties

commit 193e6f23191d7dba559ce287940c4728039db351
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 28 14:35:19 2014 +0100

    [FIX CI]

commit 9ece422df821bb7e28dfcec7523cf52b11929ef1
Merge: bfee40e 4217bfb
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Nov 27 13:48:34 2014 +0100

    Merge branch 'master' into fs_81940714_maintenance_currency_and_amount

commit bfee40e3dc45c46969847d84572000ec526b0a95
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Nov 26 17:10:29 2014 +0100

    [#71641296] adapting daily view scenarios

commit 5a0c3a271e1f086511f888cb0a3280279ca806b6
Merge: b577cc2 faf8ed8
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Nov 26 17:07:37 2014 +0100

    Merge branch 'master' into fs_81940714_maintenance_currency_and_amount

commit b577cc2076386de66ef0ba94f9ae689deca1a3c9
Merge: fc3ea55 ea9e322
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Nov 25 11:05:54 2014 +0100

    Merge branch 'fs_daily_view' into fs_81940714_maintenance_currency_and_amount

commit fc3ea55d01f74797654c3ccd503b02d37331c382
Merge: 2fddb60 ee36272
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Nov 25 11:04:17 2014 +0100

    Merge branch 'fs_booking_calendar' into fs_81940714_maintenance_currency_and_amount

commit 2fddb60cb6d8c066766e784be70cf7a6cf01c71c
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Nov 24 15:58:13 2014 +0100

    [#81940714] software license maintenance currency and amount fields

commit ea9e3224d517e056f877af05b50968c7af94a269
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Mon Nov 24 12:32:06 2014 +0100

    new daily view

commit ee362722aeff788b60fa241f93b4801c9af79745
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 21 22:58:23 2014 +0100

    [#82847794] warning messages on manage booking calendar

commit 7638cefd646b7f77bc0392bec221aa35409db072
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 21 11:03:18 2014 +0100

    [#82847794] booking calendar scenarios

commit 8d566d7f233885db174fee0bc3e47546765bb53e
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Nov 21 10:30:32 2014 +0100

    (wip) daily view

commit 1db6395adc23ec27cbcb5b08f98b4c07c777012c
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Nov 20 16:22:52 2014 +0100

    [FIX CI]

commit 499df51cb81e834a9a69a2945fc773211291748b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Nov 20 15:42:42 2014 +0100

    [FIX CI] error messages on booking calendar

commit a75b310f985ca3b80b99e2bc036558d106b59937
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Thu Nov 20 15:05:08 2014 +0100

    better error messages on booking calendar
Merge branch 'master' into rca_translate_features

Conflicts:
	cider-ci/tasks/cucumber.yml
	cider-ci/tasks/cucumber_scenarios.yml
	features/examples/ausleihe.feature
	features/examples/benutzerverwaltung.feature
	features/examples/bestellung.feature
	features/examples/tagesansicht.feature
	features/personas/dumps/minimal_seed.sql
	features/step_definitions/examples/ausleihe_steps.rb
	features/step_definitions/examples/bestellenden_wechseln_steps.rb
	features/step_definitions/examples/zweck_steps.rb