Merge pull request #137 from University-of-Auckland/aaf-develop

Branding: attribute filter instructions URL
API: cosmetic fix for timestamp comment

Change the syntax for the timestamp comment in generated attribute
filter to include a space before closing the comment.

Cosmetic fix plus makes existing tools correctly identify this line as a
timestamp comment.
Merge branch 'aaf-develop' into code-develop
Merge branch 'code-develop' into tuakiri-develop