merged directories for non-gallery-images and files
  * updated to jetty 8.*
  * updated to slf4j 1.7.2
  * updated the  filemanager and fixed issues