Merge branch 'master' of github.com:sebastian-lenz/typedoc into v0.4

# Conflicts:
#	bin/typedoc.js
#	src/td/converter/plugins/CommentPlugin.ts
#	src/td/converter/plugins/ImplementsPlugin.ts

Author: sebastian-lenz

lib/converter/plugins/CommentPlugin.js

@@ -102,7 +102,7 @@ var CommentPlugin = (function (_super) {
         var rawComment = comment_1.getRawComment(node);
         if (!rawComment)
             return;
-        if (reflection.kindOf(index_3.ReflectionKind.FunctionOrMethod)) {
+        if (reflection.kindOf(index_3.ReflectionKind.FunctionOrMethod) || (reflection.kindOf(index_3.ReflectionKind.Event) && reflection['signatures'])) {
             var comment = comment_1.parseComment(rawComment, reflection.comment);
             this.applyModifiers(reflection, comment);
         }

lib/converter/plugins/ImplementsPlugin.js

@@ -70,7 +70,9 @@ var ImplementsPlugin = (function (_super) {
             if (target instanceof index_1.SignatureReflection && target.parameters &&
                 source instanceof index_1.SignatureReflection && source.parameters) {
                 for (var index = 0, count = target.parameters.length; index < count; index++) {
-                    target.parameters[index].comment.copyFrom(source.parameters[index].comment);
+                    if (target.parameters[index].comment) {
+                        target.parameters[index].comment.copyFrom(source.parameters[index].comment);
+                    }
                 }
             }
         }

src/lib/converter/plugins/CommentPlugin.ts

@@ -169,7 +169,7 @@ export class CommentPlugin extends ConverterComponent
         var rawComment = getRawComment(node);
         if (!rawComment) return;
 
-        if (reflection.kindOf(ReflectionKind.FunctionOrMethod)) {
+        if (reflection.kindOf(ReflectionKind.FunctionOrMethod) || (reflection.kindOf(ReflectionKind.Event) && reflection['signatures'])) {
             var comment = parseComment(rawComment, reflection.comment);
             this.applyModifiers(reflection, comment);
         } else if (reflection.kindOf(ReflectionKind.Module)) {

src/lib/converter/plugins/ImplementsPlugin.ts

@@ -83,7 +83,9 @@ export class ImplementsPlugin extends ConverterComponent
             if (target instanceof SignatureReflection && target.parameters &&
                 source instanceof SignatureReflection && source.parameters) {
                 for (var index = 0, count = target.parameters.length; index < count; index++) {
-                    target.parameters[index].comment.copyFrom(source.parameters[index].comment);
+                    if (target.parameters[index].comment) {
+                        target.parameters[index].comment.copyFrom(source.parameters[index].comment);
+                    }
                 }
             }
         }