Moved the class diagram on top of the GUI mockup.
Merge branch 'master' into gh-pages to update mainpage.dox.
Updated the documentation.

The new class diagram is now displayed and moved to the top.