Trying to get the workgroups feature test more stable
Improved test stability

Squashed commit of the following:

commit 599f98339eb1b89ee65ca0a1c272e41ca94eaf37
Author: Thomas Schank <DrTom@schank.ch>
Date:   Thu Nov 21 11:26:34 2013 +0100

    Getting an other one more stable

commit 9dac05a0400ea40b36459e9ebd8e731dc7a88153
Author: Thomas Schank <DrTom@schank.ch>
Date:   Thu Nov 21 10:19:19 2013 +0100

    ... ahhhh
Merged Piotr's pf_retina_assets and fixed a feature test

Squashed commit of the following:

commit b81a06cc236082abe2c67a2647832253b3c34576
Author: Thomas Schank <DrTom@schank.ch>
Date:   Thu Nov 21 12:06:47 2013 +0100

    Fix feature test

commit 5d12ba8e93c958e3203ea6319421a30c3636385e
Author: Thomas Schank <DrTom@schank.ch>
Date:   Thu Nov 21 11:49:14 2013 +0100

    Merged Piotr's pf_retina_assets

    Squashed commit of the following:

    commit ef1330de2a3a69383f54ad13eded8773572337e9
    Author: Thomas Schank <DrTom@schank.ch>
    Date:   Tue Nov 19 14:31:42 2013 +0100

        Squashmerged (again) pf_retina_assets on to of next

        Conflicts:
        	app/views/permissions/edit.html.haml
        	app/views/styleguide/3 Buttons & Links/_buttons_and_links.html
        	app/views/styleguide/6 Components/_components.html
        	app/views/styleguide/7 Combos/_combos.html
Merged Michael's upgrading_bootstrap

Primary author: Michał Podlecki <m.podlecki@op.pl>

Squashed commit of the following:

commit b633c226809f57bf132d1cbd5bb52a5859e8b622
Author: Michał Podlecki <m.podlecki@op.pl>
Date:   Thu Oct 31 09:29:18 2013 +0100

    upgrade bootstrap to v3.0 and font-awesome to v4.0.3
Merged Michael's users_amount_of_content

Primary author: Michał Podlecki <m.podlecki@op.pl>

Squashed commit of the following:

commit b3704f2f843d1ee225fe4ad6e9ee33cadca0c463
Author: Michał Podlecki <m.podlecki@op.pl>
Date:   Mon Nov 11 11:08:36 2013 +0100

    improve feature test for sorting select element

commit e78acfdcc69f5ea42010ac9f8d849f571220d886
Author: Michał Podlecki <m.podlecki@op.pl>
Date:   Mon Nov 11 10:58:59 2013 +0100

    feature test for sorting users by amount of resources

commit 13ee816b1aefcb2f3c04363588e2b7e72248a6fa
Author: Michał Podlecki <m.podlecki@op.pl>
Date:   Mon Nov 11 10:32:08 2013 +0100

    feature test for default user sorting

commit bf7f1493e3e0932f7e76806d83dc4aae97a6823c
Author: Michał Podlecki <m.podlecki@op.pl>
Date:   Mon Nov 11 10:01:04 2013 +0100

    test feature for user listing

commit d1edc790a36d51333682ada58be40f46f0372556
Author: Michał Podlecki <m.podlecki@op.pl>
Date:   Mon Nov 11 08:25:33 2013 +0100

    enable sorting users list by login and amount of resources

commit 736533a94d0afa92b559d7fecec7c706c4c2742c
Author: Michał Podlecki <m.podlecki@op.pl>
Date:   Thu Nov 7 11:29:00 2013 +0100

    show info about user's amount of resources
Fixed feature test (# of resources in admin users table)
Merged Michael's display_if_people_are_groups

Squashed commit of the following:

commit e96c76942ed2024159ee00c66d3a5b7a2e69b15c
Author: Michał Podlecki <m.podlecki@op.pl>
Date:   Tue Nov 12 11:24:34 2013 +0100

    display if people are groups; ability to filter them
Merged Michael's back_button_to_the_media_archive

Conflicts:
	app/views/layouts/app_admin.html.haml
	features/step_definitions/i_see_steps.rb
Added admin_interface feature to the domina tasks
Integrated Piotr's color and contrast

Squashed commit of the following:

commit 938230f2850cdc71d2b6eeeeb656323406962458
Author: Piotr F <piotr@piotrf.pl>
Date:   Fri Nov 22 13:47:57 2013 +0100

    Add contrasted colour scheme and color variations.

    Conflicts:
    	app/assets/images/backgrounds/thumb-catalog-backg.png
    	app/assets/images/backgrounds/thumb-catalog-backg@2x.png
    	app/assets/stylesheets/_config.sass
    	app/assets/stylesheets/application.sass
    	app/assets/stylesheets/combos/_ui-clipboard.sass
    	app/assets/stylesheets/combos/_ui-featured-entries.sass
    	app/assets/stylesheets/combos/_ui-resources-common.sass
    	app/assets/stylesheets/combos/_ui-resources-grid.sass
    	app/assets/stylesheets/combos/_ui-resources-list.sass
    	app/assets/stylesheets/combos/_ui-resources-miniature.sass
    	app/assets/stylesheets/components/_ui-body-title.sass
    	app/assets/stylesheets/components/_ui-containers.sass
    	app/assets/stylesheets/components/_ui-tabs.sass
    	app/assets/stylesheets/components/_ui-thumb-catalog.sass
    	app/assets/stylesheets/components/_ui-thumb.sass
    	app/assets/stylesheets/general/_buttons.sass
    	app/views/application/header/_user.html.haml
    	app/views/layouts/styleguide.html.haml
Reordered all translation files lexically
Translate on the fly (js) and invalidate translation cache (rb) when in development mode
Renaming and (re)translating some aspects of the permission views

Translated "Permissions and responsibility"

Consistent translation of permission properties

More translations for permissions
Trying to get the delete feature test more stable
Adjustments and fixes of retina_assets wrt permission views

Squashed commit of the following:

commit 8b503947efa5ec51bc58a8dc58ef207f6f173662
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 28 13:26:37 2013 +0100

    Tweak mixed values checkbox style in the permission management module.

commit 669f6ad160e2dc67c9900cc18b8b69e54bd10cb1
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 28 12:37:44 2013 +0100

    Tweak globe icon appearance in the rights management module.

commit 074c2385fe97065f018bd0c75fb58be2cc851eeb
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Nov 28 12:37:26 2013 +0100

    Remove 'my archive' link from Permissions View.

commit 27b23f597c26597e64843d949deac949c72ec630
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Nov 27 14:57:56 2013 +0100

    Fix display of globe in permissions

commit ee2dc61a73d0bf00c087d3a52c92907ff53e337f
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 27 12:17:44 2013 +0100

    Fix globe icon missing in permissions screens.

commit dc7afd6f78a386aa0ee542db864451d5e7e0b148
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Nov 27 12:17:19 2013 +0100

    Fix close modal icon missing.
Allow and allow only the :settings for updating a filter set
Upgrading domina (port management, timeout ...); using RUBY_VERSION env-var

Squashed commit of the following:

commit 92ea812b6372a38deec78e9faab27326e9459448
Author: Thomas Schank <DrTom@schank.ch>
Date:   Mon Dec 2 13:16:37 2013 +0100

    fix

commit da054d632136b83869abbcc740e0e0f766745e3c
Author: Thomas Schank <DrTom@schank.ch>
Date:   Mon Dec 2 13:15:41 2013 +0100

    Revert "Switching from firefox to chrome"

    This reverts commit 5b8680498558c171a537d402f58173a7bb61617c.

commit 1f5b2499884b52b24fcc9679b090cdda2b5c5dda
Author: Thomas Schank <DrTom@schank.ch>
Date:   Mon Dec 2 13:15:25 2013 +0100

    Revert "Updated selenium webdriver"

    This reverts commit 7de1718a551f1b156c6c69aade114cd736b89528.

commit 7de1718a551f1b156c6c69aade114cd736b89528
Author: Thomas Schank <DrTom@schank.ch>
Date:   Mon Dec 2 13:04:57 2013 +0100

    Updated selenium webdriver

commit 5b8680498558c171a537d402f58173a7bb61617c
Author: Thomas Schank <DrTom@schank.ch>
Date:   Mon Dec 2 12:42:52 2013 +0100

    Switching from firefox to chrome

commit 1b03e44f2cf5194b8e59a2980b7f22b72879b6b8
Author: Thomas Schank <DrTom@schank.ch>
Date:   Mon Dec 2 11:13:11 2013 +0100

    fix

commit c1137fe35adf0427120286ee6a09eed07ecb3544
Author: Thomas Schank <DrTom@schank.ch>
Date:   Mon Dec 2 10:28:49 2013 +0100

    Domina: define ruby version as env_var; increase timeout for bundler

commit 24ee08ddbf83f8d038ee82a522cddb47c9f371ed
Author: Thomas Schank <DrTom@schank.ch>
Date:   Mon Dec 2 10:08:53 2013 +0100

    Domina: using the ports feature for getting a xvnc port
Switching from chrome to firefox in some cases for more stable tests
Domina specification: features are now ordered before specs so they will be executed first
Task fetch_personas will work over vpn

and actually report something when it fails