implemented new layout for server-view
Merge remote-tracking branch 'origin/master'

Conflicts:
	acMonitor.js
	views/server.handlebars