Fixed resolving of the layout files when two packages are avaialbel
Merge branch 'master' of https://github.com/Sitefinity/feather