update grunt: ignore layout file
Merge remote-tracking branch 'origin/dev' into dev
update header