revamp template name, use version file

remove dots from version

spaces after #

additional small changes
Merge pull request #911 from apagac/template_upload_name_fix

Template upload: revamp template name, use version file