featureA dir added
Merge branch 'development' into featureB