Fixed double registration of layout files
Merge branch 'development' of https://github.com/Sitefinity/feather into development