Merge for single nodes with properties

 o Removed OR syntax for labels in MATCH
 o Added syntax for literal maps in MERGE for nodes
Merge pull request #707 from systay/merge

Merge for single nodes with properties