Fixing syntax for new bulk upload set folder
Removing content markup and adding logic
Linking up the SS version of jquery to avoid duplication issues
Merge remote-tracking branch 'upstream/master'