Merge pull request #200 from ncimino/master

all junit methods were changed to have correct comments
roll back
catalog update
merged with latest