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