Refactored admin/user and fixed text search

Squashed commit of the following:

commit 8059aa9c55dabbeba852528bcd1adb60acf5685a
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Jan 29 13:38:44 2014 +0100

    Fix test

commit 2e62b68a1a3835ce729cdad7bd8c473ba06e00de
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Jan 29 13:31:34 2014 +0100

    Updated personas db

commit 1a4e2f1100200a4306232e096fa71f3a26a51959
Author: Thomas Schank <DrTom@schank.ch>
Date:   Wed Jan 29 13:24:49 2014 +0100

    Refactored and fixed text search for admin/user