Fixing style
Merge remote-tracking branch 'cortiz/master'
Merge branch 'master' of github.com:craftercms/studio3