Merge branch 'develop'

# Conflicts:
#	.travis.yml

Author: stritti

.travis.yml

@@ -29,7 +29,7 @@ deploy:
   api_key:
     secure: iKdorqXgiTH3RcLLNj8Q4AoRWxpYA6yT7YDYKnuORz3tcAvHrIBmt+ff6h5zsn2JVGkFamc0njfYdrOfLdc4+cQQfQVq80OhJJnkIQ0WgOtG0yt+yVHKb8lWBGr9P0lMvvBuROsuxGl9jPcgkUTtuvxHoJ3T24WlLDGXJSWdCzw=
   file_glob: true
-  file: log4js/target/*
+  file: target/*.zip
   skip_cleanup: true
   on:
     repo: stritti/log4js

log4js-site/xdocs/content/xdocs/links.xml

@@ -62,15 +62,6 @@
 	            </ul>
 	        </section>
 
-	        <section id="documentation">
-	            <title>Tools used for Documentation</title>
-	            <ul>
-	                <li>Forrest for generating web site: 
-	                	<a href="http://forrest.apache.org">http://forrest.apache.org</a></li>
-	                <li>JSDoc for API documentation: 
-	                	<a href="http://www.anvilon.com/software/jsjam/">http://www.anvilon.com/software/jsjam/</a></li>
-	            </ul>
-	        </section>
 
 	        <section id="otherProjects">
 	            <title>Other JavaScript Logging Projects</title>