Merged commits from PS1.5 multistore branch:

commit 4c8437c8bb33ad4dc7659105e016c4877c28caa6
Author: Carlos Escribano Rey <carlos@markhaus.com>
Date:   Thu Sep 12 13:25:49 2013 +0200

    #1131 - Unify JSON config

    Signed-off-by: Carlos Escribano Rey <carlos@markhaus.com>

commit 124da748a6c94f44a48db5e3ce19cf30ada3c7ac
Author: Carlos Escribano Rey <carlos@markhaus.com>
Date:   Wed Sep 11 13:53:39 2013 +0200

    #1119 - Multistore feature

    Signed-off-by: Carlos Escribano Rey <carlos@markhaus.com>

Signed-off-by: Carlos Escribano Rey <carlos@markhaus.com>