Merge remote-tracking branch 'origin/beta'
Merge remote-tracking branch 'origin/beta'
Merge remote-tracking branch 'origin/beta'
Merge remote-tracking branch 'origin/beta'
Merge remote-tracking branch 'origin/beta'
Merge remote-tracking branch 'origin/beta'
Merge remote-tracking branch 'origin/beta'
Merge remote-tracking branch 'origin/beta'
Merge remote-tracking branch 'origin/beta'
[Emulink] patch for PIM parser (transitions with the same label are now correctly imported)
[Emulink] improved rendering of edges
[Emulink] patch for transitions labels rendered upside down + improved rendering of edges
improved feedback for errors releated to pvs files not on the path
patch for failed server test
[Emulink] patch for delete/rename transition dialogue (initial transitions were not shown)
[Emulink] patch for create new state (a new state was erroneously created on mouseup events generated after dragging the canvas)
Merge branch 'master' into alpha

* master:
  [Emulink] patch for create new state (a new state was erroneously created on mouseup events generated after dragging the canvas)
  [Emulink] patch for delete/rename transition dialogue (initial transitions were not shown)
  patch for failed server test
  improved feedback for errors releated to pvs files not on the path
  [Emulink] patch for transitions labels rendered upside down + improved rendering of edges
  [Emulink] improved rendering of edges
  [Emulink] patch for PIM parser (transitions with the same label are now correctly imported)