Merge branch 'master' of github.com:peterbe/netsplit

Conflicts:
	client/www/css/netsplit.less