Adding Directory Upload files, some bugs still with IcedTea applet
Resolving merge conflicts