style.css added, removed style.less, minor changes in client.html
Merge remote-tracking branch 'origin/master'