commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	Projects/Deploy/ConfigurationService/config.fscp
	Projects/FireAdministrator/Modules/GroupControllerModule/Parameters/ViewModels/BaseAUPropertyViewModel.cs
	Projects/FireAdministrator/Modules/GroupControllerModule/Validation/Validator.Devices.cs