fix line endings
Merge remote branch 'origin/master'
adding modman distribution for the adminhtml layout xml