Styling
Merge branch 'master' of https://github.com/umbraco/Belle

Conflicts:

Umbraco.Belle.Client/node_modules/grunt-testacular/node_modules/testacul
ar/node_modules/socket.io/node_modules/socket.io-client/lib/vendor/web-s
ocket-js/flash-src/com/hurlant/crypto/rsa/RSAKey.as