[#71745214] attachments for software

Squashed commit of the following:

commit 26a8f47f10cd67cde112279d6251a539c48b4a39
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Jun 4 13:57:08 2014 +0200

    fix ci part 2

commit f850bec28c9675ec755fa9bb7ef78dc77a40c46d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Jun 4 12:06:48 2014 +0200

    [FIX CI]

commit 5f5e17bce476a5fbce5be54d6bfe328c1e5a0dff
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Jun 3 17:19:19 2014 +0200

    tests wip
Merge branch 'master' into fs_optimizing_ci

Conflicts:
	cider-ci/tasks/cucumber_scenarios.yml
	features/examples/gegenstand_editieren.feature
	features/examples/inventarhelfer.feature
	features/examples/modell.feature
	features/examples/software_editieren.feature
	features/examples/software_erfassen.feature
	features/examples/software_suchen.feature
	features/manage/acknowledge/quick_approve.feature
	features/software_loeschen.feature
	features/step_definitions/examples/gegenstand_editieren_steps.rb
	features/step_definitions/languages/de_steps.rb