Remove some dead code
Merge branch 'master' of github.com:lanoxx/fuml-refactoring
Fixed report formulations and typos