Squashed and merged rails4 on top of next

commit 46b25bd1bca133eb671ef9bb201cc5ec4b572c46
Author: Thomas Schank <DrTom@schank.ch>
Date:   Tue Dec 3 08:59:16 2013 +0100

    Refactored filters removed implicit arguments and scoped

commit e835655a37c7179c4d64b1bc8771dd70a6ada0d8
Author: Thomas Schank <DrTom@schank.ch>
Date:   Mon Dec 2 15:22:04 2013 +0100

    Enabled weired login_and_return_here path again

commit 2b4948153cb8e13fe748820b0cb1de695ebe4788
Author: Thomas Schank <DrTom@schank.ch>
Date:   Mon Dec 2 15:18:03 2013 +0100

    Fix association

commit 4acec30235137fdec259f741d75bab11cac8b64c
Author: Thomas Schank <DrTom@schank.ch>
Date:   Mon Dec 2 15:08:53 2013 +0100

    Link log-out "button" to session controller sign-out

commit 75318d7adb73f59278852301f4b00650e188c381
Author: Thomas Schank <DrTom@schank.ch>
Date:   Mon Dec 2 15:01:26 2013 +0100

    Rebased again on top of next

    Conflicts:
    	domina/execution/features_and_specs.yml
Fixed some of the filter issues