Merge remote-tracking branch 'upstream/master'
[JS] Fix: Relation missmatch
Remove Wrong Line
Merge pull request #4 from jasoet/fixRelationBug

Fix relation bug