Added description of the attribute grammar.
Merge branch 'master' into dev