Moved the Main class back to the validator package, so the Jar builder knows where to find it
Merge remote-tracking branch 'origin/master'