Merge pull request #243 from dejan-brkic/master

CRAFTERCMS-841
Fixes CRAFTERCMS-845
Partially fix collision  when creating Crafter and Alfresco Sites.
Update file-name.js