Merge pull request #257 from firethanatos/master

This should work
Fixed user manual edits
Merge pull request #258 from firethanatos/master

Added version 2.0 description and remvod known bugs
Updated Class Diagram
Merge pull request #260 from graemesmth/master

Updated Class Diagram