Added configuration files to repository
Merge commit '4283cb2ef735d0dd6139b39f993e48e63a5887af'