Merge branch 'Mickroz-master'
line endings
permissions settings
merged with origin
merged with origin