Merge pull request #149 from sylvaindeloux/develop

SONATA-451 - Fixed display
SONATA-459 - Updated stepper active color