[#70350718] merging feature files, optimizing tests and introducing benchmark

Squashed commit of the following:

commit 2d9ffef44fe488391935b7c2094bb632f39314c2
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 18:23:36 2014 +0200

    increase CI timeout to 10 minutes

commit 1f48d5437d370a0f4e7df4d79697d691a1e88fcb
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 18:12:24 2014 +0200

    separate test benchmark from routes_report

commit f7a1c6ffa6f3fedcd289d40b63ddc77a5a685857
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 18:11:14 2014 +0200

    reactivating @javascript tag just where needed

commit 0d24d4e5c72c0b026f7da04a8f8ab9a8be5ee595
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 18:11:02 2014 +0200

    removing deprecation warnings for Rails 4.1

commit 2493f9e81df90d59d0db6f615fe9e962f94a673f
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 18:10:16 2014 +0200

    decreasing test sleeps

commit 8f4f6469134792426f9e598e786e14f3e3d34ebd
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 16:56:30 2014 +0200

    decreasing test sleeps

commit ef072111ad58c32e485747683dbb65a536f3fecc
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 16:55:53 2014 +0200

    fixing tests

commit b29c4758bedfa6ac33edacadcdc6813fc5078ef0
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 16:54:32 2014 +0200

    reactivating @javascript tag just where needed

commit ed13038f32e29caaca447983c570e35aacb40e34
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 13:47:35 2014 +0200

    introducing RoutesReport as class and defining thresholds for time delay

commit 92e76f9653ca4cced67440951a475c6ece8f0703
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 13:46:37 2014 +0200

    prevent clashing on factory

commit ba26f15111df29b2c3ed28b38f8db0b47294917a
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 13:46:01 2014 +0200

    removing deprecation warnings for Rails 4.1

commit 931ef5fbd5bf149bf45ba588a78339f4cc6819fd
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 12:38:36 2014 +0200

    fixing typo and reactivating @javascript tag just where needed

commit 8b552a6f34e5fb901f2d73b1fbef77f7c142763b
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 12:28:23 2014 +0200

    removing deprecation warnings for Rails 4.1

commit 3ac5b6e00a33f2608caf52bf3edc4753c521a787
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 12:26:52 2014 +0200

    reactivating @javascript tag just where needed

commit 55f99351c1e0f7f33ed91fe0ead07b767c09a8d1
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 12:26:37 2014 +0200

    removing unused code

commit d0d6fa08a5c6e736fbca73bac2bad645a04b7942
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 12:14:32 2014 +0200

    populating german steps dictionary

commit a19071eaf2cf5cdda67236530f8dfc620b5d9833
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Wed Apr 30 10:36:34 2014 +0200

    reactivating @javascript tag just where needed

commit d4416d720c1ee11739b90ff0e7b0bba77ce21aeb
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 29 16:53:46 2014 +0200

    reactivating routes_report and include test benchmark

commit 94890969e9afafe0b7f30e197642ab23bb5accaa
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 29 16:53:00 2014 +0200

    optimizing benutzerverwaltung steps

commit 8befc3d920e7e3121c54a1d9be8513af32ad3ab9
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 29 16:52:01 2014 +0200

    try test execution without @javascript tag

commit a712e3b85850c6fb671c0a79b7e3a23323a1e9f6
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 29 15:03:13 2014 +0200

    trying raising timeout

commit 41e7e7da9f1d86a11a2c1d401d72e22b838da435
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 29 14:54:55 2014 +0200

    introducing german cucumber steps dictionary and mor simplifying persona steps

commit 66fd8922cc06b8960c0648e774d2e127f387b0e1
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 29 14:30:32 2014 +0200

    simplifying persona steps

commit d22128ce508c2390094815a0b26c564d324cb069
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 29 13:35:05 2014 +0200

    updating feature_tasks.yml

commit 114b13a85d714beb0ed86dca268418884d5f2355
Author: Franco Sellitto <franco.sellitto@zhdk.ch>
Date:   Tue Apr 29 13:31:29 2014 +0200

    merging back previously splitted feature files
Merge branch 'next' into mk_software_additional_fields
remove duplicate old feature file