Merge pull request #2 from barredijkstra/master

Moved the content from the "mischa" branch to the master branch
Removed the fitting-instance from the modules so it's not included in the full project build.