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
Updated personas db
Domina: using the priority setting in contexts
Adjust text in manage permissions and remove superfluous whitespace
Show info about user's amount of resources

Squashed commit of the following:

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

    show info about user's amount of resources
Group can be deleted from its detail view

Squashed commit of the following:

commit 9dd29cc38b7e9f63fb3692e4f0ff896c03aa9771
Author: Michał Podlecki <m.podlecki@op.pl>
Date:   Mon Nov 25 07:47:43 2013 +0100

    group can be deleted from its detail view
Add user to the group by user details not by ID

TS: changed from @firefox to @jsbrowser

Conflicts:
	features/admin_groups.feature
Add ability to filter groups by their types

TS: problem resolution needs to be checked

Conflicts:
	app/assets/stylesheets/app_admin.css.sass
	features/admin_groups.feature
Fix broken feature test
Restore fix some wrong choices of manual merge
Integration of type and spacing feature

Squashed commit of the following:

commit f93a3109d002a1b81f4ed1bd084f350e279d818d
Author: Thomas Schank <DrTom@schank.ch>
Date:   Fri Dec 6 11:24:49 2013 +0100

    Adjust text in manage permissions and remove superfluous whitespace

commit aef48e5e79ade764423b5d073efacbce2cf8f886
Author: Thomas Schank <DrTom@schank.ch>
Date:   Fri Dec 6 10:45:16 2013 +0100

    Domina: using the priority setting in contexts

commit e6ef708fed0733f3865be081ffa2b74bcf1909b4
Author: Thomas Schank <DrTom@schank.ch>
Date:   Thu Dec 5 22:14:46 2013 +0100

    Updated personas db

commit 86c80d7761fe42380e2edb9a8baed93539c80558
Author: Thomas Schank <DrTom@schank.ch>
Date:   Thu Dec 5 22:05:05 2013 +0100

    Task fetch_personas will work over vpn

    and actually report something when it fails

commit 184d703dc615ee3e7ede6f149246eae683929536
Author: Piotr F <piotr@piotrf.pl>
Date:   Fri Dec 6 13:02:31 2013 +0100

    In sidebar: bring back arrows to indicate state of the filters on all levels.

commit 8da8f0cf01e658d1a78761052ac08e87bda13e13
Author: Piotr F <piotr@piotrf.pl>
Date:   Fri Dec 6 12:51:14 2013 +0100

    Add rewind icon to the filter reset link.

commit 128b7ff04f0dbbdd9320a305fa54f3acb82c6005
Author: Piotr F <piotr@piotrf.pl>
Date:   Fri Dec 6 12:49:23 2013 +0100

    Document rewind icon.

commit 6b7afa14e5ee771b2bf1e875a97bcd6046bd23ee
Author: Piotr F <piotr@piotrf.pl>
Date:   Fri Dec 6 10:26:30 2013 +0100

    Rename Filtereinstellungen to Filterset… (editieren). Add in dropdown separator.

commit d70aa1845a1f3f2857820433ef71ba743c1c8337
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Dec 5 17:41:57 2013 +0100

    Remove .weak class from modal close icons. Again.

commit 092c276be743b0c63e766a1b806037b845afb752
Author: Piotr F <piotr@piotrf.pl>
Date:   Thu Dec 5 17:38:34 2013 +0100

    Correct new filterset button on the search page.

commit c09585ceb6fe762050f9098a5043c13068a1b8b4
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Dec 4 18:03:33 2013 +0100

    Fix the weird dropdown in ZDHK bereich missing icons. They’re still misaligned.

commit e4520cfc4b3fa582e258af44fb21d5828a6a1a71
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Dec 4 18:02:37 2013 +0100

    Move alerts below the header. Increase their paddings.

commit 34a6ec6d05ad7c31f63b6bff5f14ba7e1c4de05d
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Dec 4 16:51:08 2013 +0100

    Update deployment info paragraph in the footer to include link.

commit 167833e30ce3ed000663d3a5c4c3eb1f84dd4647
Author: Piotr F <piotr@piotrf.pl>
Date:   Wed Dec 4 12:26:34 2013 +0100

    Squash and merge old type and spacing branch.
Fix broken feature tests from pf's commit