Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dist/mermaid.js
#	dist/mermaid.min.js
#	dist/mermaid.slim.js
#	dist/mermaid.slim.min.js
#	dist/mermaidAPI.js
#	dist/mermaidAPI.slim.js
#	dist/mermaidAPI.slim.min.js
#	package.json

src/diagrams/flowchart/parser/flow.jison

@@ -21,7 +21,7 @@
 "click"               return 'CLICK';
 "graph"               return 'GRAPH';
 "subgraph"            return 'subgraph';
-"end"\s*              return 'end';
+"end"\b\s*            return 'end';
 "LR"                  return 'DIR';
 "RL"                  return 'DIR';
 "TB"                  return 'DIR';

src/diagrams/flowchart/parser/flow.spec.js

@@ -308,6 +308,18 @@ describe('when parsing ',function(){
         expect(edges[0].text).toBe('');
     });
 
+    it('should handle node names with "end" substring',function(){
+        var res = flow.parser.parse('graph TD\nendpoint --> sender');
+
+        var vert = flow.parser.yy.getVertices();
+        var edges = flow.parser.yy.getEdges();
+
+        expect(vert['endpoint'].id).toBe('endpoint');
+        expect(vert['sender'].id).toBe('sender');
+        expect(edges[0].start).toBe('endpoint');
+        expect(edges[0].end).toBe('sender');
+    });
+
     it('should handle open ended edges',function(){
         var res = flow.parser.parse('graph TD;A---B;');