Merge branch 'master' into 1.6.4
Eclipse Clean Up
Added a jar for sonar testing
Added Sonar
Merge branch '1.6.4'