[cleanup] Removed too many serialVersionUIDs
[cleanup] Put NOSONAR in the right line
Merge pull request #55 from wallner/sonar_cleanup

Sonar cleanup