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

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/sQu1rr/server-monitor-app