alarm commit
alarm commit
Merge branch 'master' of https://github.com/igors48/nmdService

Conflicts:
	src/main/java/nmd/rss/collector/rest/UpdatesServiceWrapper.java