BUG Fixing missing </div> and </button> in UploadField_uploadtemplate
Merge pull request #2020 from halkyon/uploadfield_missing_end_tags

BUG Fixing missing </div> and </button> in UploadField_uploadtemplate