Merge sonata 5.04.2013, updates for user roles