Support/2.1.1

i created the branch 'Support/2.1.1' for fixed the creating the path for media files based on the language used