no message
Merge branch 'master' of https://github.com/sQu1rr/server-monitor-app

Conflicts:
	main-server/index.html
Merge branch 'master' of https://github.com/sQu1rr/server-monitor-app