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

Conflicts:
	main-server/js/index.js