commit
Merge branch 'master' of https://github.com/hackyfamily/Monitoring

Conflicts:
	Monitoring_Server/Monitoring/Controllers/AlertsController.cs