Fix: Tomcat complains about servlet container being already provided.

Catelina.out:
jar not loaded. See Servlet Spec 2.3, section 9.7.2. Offenending class: javax/servlet/Servlet.class
Update UploadServlet

* Better Loging
* Moved SQL Statements to separate file
* Cleandup insert loop
Merge remote-tracking branch 'upstream/master'