Fixed issue found when not including sample or atlas image in buid.
Merge branch 'master' of https://github.com/rii-mango/Papaya-Builder.git