changing template name
Refactoring
Merge branch 'master' of git://github.com/Chill-project/CustomFields