Javadocs, don't allow atlas file to have image extension.

closes #863
Merge branch 'origin/master'