CRAFTERCMS-437: Integrating with UI plugin
Merge remote-tracking branch 'alvaro/master'