Added Camelot information to gui.rst
Linked explicitly to 2.x documentation
Merge pull request #318 from rgbkrk/patch-1

Linked explicitly to 2.x documentation
Merge pull request #313 from jeroendierckx/master

Added Camelot information to gui.rst
Merge branch 'upstream'