Merge branch 'master' of https://github.com/sulandr/tickets_monitoring

Conflicts:
	.idea/workspace.xml