Squashed and rebased rails4 branch on top of next

Squashed commit of the following:

commit 5d93a75d8fa4f56ba8a8d7621d78a77d877fa3bf
Author: Thomas Schank <DrTom@schank.ch>
Date:   Fri Nov 29 13:35:08 2013 +0100

    Took care of another deprecation

commit 5ae38c5f66a1131917e1c46029b940b965580d48
Author: Thomas Schank <DrTom@schank.ch>
Date:   Fri Nov 29 13:34:03 2013 +0100

    Fix another case of uninitialized AppSettings in a spec

commit 712196392804fa90205a8160c1784d1def30e29f
Author: Thomas Schank <DrTom@schank.ch>
Date:   Fri Nov 29 13:30:46 2013 +0100

    Changed transfer in admin people_controller to make test pass

commit 73d75e5e6df6705be480125ea0ae93a776d971cd
Author: Thomas Schank <DrTom@schank.ch>
Date:   Fri Nov 29 12:58:30 2013 +0100

    (Re)enable some routes wrt. download

commit 7ec140a8f3a518aa0d96578270eef002319951b3
Author: Thomas Schank <DrTom@schank.ch>
Date:   Fri Nov 29 12:48:35 2013 +0100

    Allow and allow only the :settings for updating a filter set

commit 6b2a62cb7c7e5cf9dc31ec9b541d7d620038a7ac
Author: Thomas Schank <DrTom@schank.ch>
Date:   Fri Nov 29 10:32:17 2013 +0100

    Fix another spec case where AppSettings was not present

commit d8bb7d534207a2f969945ec8d8884ac77ee13dcf
Author: Thomas Schank <DrTom@schank.ch>
Date:   Fri Nov 29 10:24:37 2013 +0100

    Fix spec

commit 108f207b0029a33e72a26aedd5bd38dee1f4dc35
Author: Thomas Schank <DrTom@schank.ch>
Date:   Fri Nov 29 10:14:50 2013 +0100

    Resolved a deprecation

commit 46e8ed5a3f777433c6f9a2c2f5fd0802e93d10b8
Author: Thomas Schank <DrTom@schank.ch>
Date:   Fri Nov 29 10:07:54 2013 +0100

    Fixed a case of uninitialized AppSettings in the specs

commit 74a351573efc8ffef98b74a7f8873ef1bb941cdc
Author: Thomas Schank <DrTom@schank.ch>
Date:   Fri Nov 29 09:58:47 2013 +0100

    Put a patch on a meta programming issue in our json helper

commit bad3d50d0dc8876520bf7266d4305614a9a72efa
Author: Thomas Schank <DrTom@schank.ch>
Date:   Fri Nov 29 09:52:08 2013 +0100

    Fixed deprecation

commit ccc12c0be389e18c2d46b13694a190518c667ae8
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Nov 27 10:21:35 2013 +0100

    Squash-rebased rails 4 on top of next

    Conflicts:
    	Gemfile
    	Gemfile.lock
    	app/views/application/header/_user.html.haml