Updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/locators.properties
NodeInfoDialog, NodeInfoTest
Merge branch 'Evgenii' of https://github.com/Kreisfahrer/Infotex into Evgenii
refactoring
Merge remote-tracking branch 'origin/master' into Vlad
Merge remote-tracking branch 'origin/Vlad'
refactoring
3.1.3, 3.1.4; 3.4.5, 3.4.6 - performance tests
3.11.2 Save SMTP Settings & 3.10.2 Save SMS Settings
Merge remote-tracking branch 'origin/master' into Evgenii

Conflicts:
	src/main/java/test/performance/ManageHostsTest.java
refactoring
Merge remote-tracking branch 'origin/Evgenii' into Evgenii
refactoring
Администрирование -> Правила анализа (3.5.4, 3.5.6, 3.5.7, 3.5.8, 3.5.9)
3.9.5 Опрос узла
Merge remote-tracking branch 'origin/master' into Evgenii
refactoring
Merge pull request #8 from Kreisfahrer/Evgenii

Evgenii
История событий