Merge pull request #53 from wallner/sonar_cleanup

Sonar cleanup
Merge pull request #54 from wallner/sonar_cleanup

Sonar cleanup
[cleanup] Removed too many serialVersionUIDs
[cleanup] Put NOSONAR in the right line