Partial squash merge of mk_software_additional_fields

Squashed commit of the following:

commit 13d492637a2fd76b3d46cb4d51ec15bb61552fe0
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Fri May 2 12:46:32 2014 +0200

    tests WIP

commit aa5607a0ffb23c225fa4dae5ef998931da69ec1d
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 18:36:20 2014 +0200

    remove duplicate old feature file

commit d54ac3a819f61126699e3bd41a2320dee69ec906
Merge: 2cec35f 0350a1e
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 18:30:02 2014 +0200

    Merge branch 'next' into mk_software_additional_fields

commit 2cec35f24f7fd9e6e8713b5cbc35146651de5711
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 17:55:11 2014 +0200

    translate keywoards on item edit page

commit 36839e34d4bc0d1cb7271067aeacae600ed9a719
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 17:54:52 2014 +0200

    dry up

commit d35c981df3086e84c2be8eb5a748063963a0a080
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 17:54:41 2014 +0200

    fix crazy current location loading for software

commit 238b56716395680a63e3bea505cf8dff96e4aa0a
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 16:59:54 2014 +0200

    edit software view text changes

commit 68669458407325f6a3fe7e0e9319448fee9c4c06
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 16:50:09 2014 +0200

    group license fields

commit 6aec8dc0be6385f21a67eab1896bce48ccf4ca12
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 16:44:33 2014 +0200

    adjust values for license fields

commit 3475816df9ed2429b7dae2621098438c1b92a315
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 16:28:45 2014 +0200

    enable is_borrowable field for license

commit 33b71ed6279bb8d512b433c351042f795d6565c1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 13:52:00 2014 +0200

    adding hints to software form

commit 447f33f981d4e1392e5527a1b6fa216073050ac1
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Wed Apr 30 13:51:17 2014 +0200

    get rid of @type and initialize appropriate class dynamically

commit 4dd6f2ce677ff9f724e087b8d58162221e434fd5
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 29 17:06:21 2014 +0200

    refactor inventory method

commit 48dc85ecf04c1012932f503457c76c1ff29c1c83
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 29 17:06:01 2014 +0200

    some new software fields

commit 496b71639ef1a7d4e506c98f817e4d92e2ff6b61
Author: Matus Kmit <matus.kmit@zhdk.ch>
Date:   Tue Apr 29 17:05:38 2014 +0200

    organize model / software field partials