Babicaa/cs-studio — pull request #3 by Babicaa (2014-07-03 07:50:59+00:00)
Title: Revert "Revert "Merging changes from origin""

Reverts Babicaa/cs-studio#2