added performance Manage - Map/Rules/Notifications test
Merge remote-tracking branch 'origin/master'
refactoring