Updated user lines deletion
Merge branch 'origin/master'
Updated fileupload directory initialisation