adding file types to list
Merge branch 'development_a' into feature_file_types