Some changes in file.tpl
Merge branch 'master'