removed unneeded dummy class
Added junit dependency
Merge branch 'master' into Resources