Bugfix, cleaning up
fix for NAF Links
coding conventions: changed names and moved constants to constants class
Merge branch 'master' into plottingDesignIdea