mark create software scenarios as upcoming
[FIX CI] features/examples/benutzerverwaltung2.feature
rbenv support for deployment to staging.
rbenv support for deployment to demo, production.
Some workarounds for rbenv.
Fixing rbenv issue.
That works better.
squashing migrations (requires tag 3.5.0 to be already installed and migrated) and  seeds settings and languages as initializers (checked on each startup and populated only on the very first one)

Squashed commit of the following:

commit 8c2551ce5d4b39bcbc58c2ecba2cca21d35263aa
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Apr 11 12:40:16 2014 +0200

    seeds settings and languages as initializers (checked on each startup and populated only on the very first one)

commit 952185a799dc34bbc60af7e2a74f839bfb394259
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Fri Apr 11 12:39:19 2014 +0200

    squashing migrations (requires tag 3.5.0 to be already installed and migrated)

commit 98d88672a64226189f37919487d2d3a4ab141bb6
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 8 16:29:50 2014 +0200

    squashing migrations (wip)
Model and Option: renaming name to product + adding version and manufacturer
updated structure_with_views.sql
renaming name to product+version
renaming name to product+version
spine: renaming name function for model and option
still renaming name
[TEST] fix find_by_product problem
change Model finder based on name
fixing change Model finder based on name
fixing typo
fixing typo and adapting javascript templates
[FIX CI] features/examples/benutzerverwaltung2.feature

Conflicts:
	db/structure.sql
	db/structure_with_views.sql