bugFix due at merge
Merge branch 'junit' of github.com:xplodwild/Atlantis into junit