Bug Fix and Security Update

File Upload Improvements: file name collision, better security
File Upload Bug Fix: removed extra line
Better Error Identification