ControlSystemStudio/cs-studio — pull request #534 by arnaudf-iter (2014-05-15 09:28:38+00:00)
Title: Merge last ITER changes on 3.3.x

resolves #531 #532
- #531: Alarm Client Model initialized twice when alarm-notifier started
- #532: Secure Preferences management improvement