Merge branch 'fix/ui-modification' of http://git.choozmo.com:3000/choozmo/bhouse_backstage into fix/ui-modification