Made the expression component of 'return' optional
Made adjacent string literals accepted
Merge branch 'grammarChanges' into typeChecking