* Changing the package.json name back to ui since it gives trouble with the build
Merge remote-tracking branch 'roy/master'
Merge pull request #50 from alvarog/master

CRAFTERCMS-437: Initial Integrating one Spring project with UI plugin to...
Merge remote-tracking branch 'alvaro/master'
Merge branch 'master' of github.com:craftercms/social
Merge remote-tracking branch 'alvaro/master'
CRAFTERCMS-370: Email notifier improvement