correction in changelog
Merge branch 'github.com/master'

Conflicts:
	test/actual/multi/dest1/helpers.html
	test/actual/multi/dest1/helpers.md
	test/actual/multi/dest1/html-helpers.html
	test/actual/multi/dest1/html-helpers.md
	test/actual/multi/dest2/sub-dest/helpers.html
	test/actual/multi/dest2/sub-dest/html-helpers.html
	test/actual/nested-layouts/helpers.html
	test/actual/paths/helpers.html
	test/actual/paths/html-helpers.html
	test/actual/yfm/associative-arrays.html
	test/actual/yfm/block-literals.html
	test/actual/yfm/document.html
	test/actual/yfm/lists.html
	test/actual/yfm/variables.html
update license and copyright notices
Merge branch 'github.com/master'

Conflicts:
	CHANGELOG
	Gruntfile.js
	README.md
	lib/data/markdown.js
	lib/engine/helpers.js
	package.json
	test/actual/multi/dest1/helpers.html
	test/actual/multi/dest1/helpers.md
	test/actual/multi/dest2/sub-dest/helpers.html
	test/actual/nested-layouts/helpers.html
	test/actual/paths/helpers.html
Merge branch 'origin/master'

Conflicts:
	CHANGELOG
	README.md
	lib/data/markdown.js
	lib/engine/helpers.js
	package.json
	test/actual/metadata-blog/meta-awesome-blog-post-2.html
	test/actual/multi/dest1/helpers.html
	test/actual/multi/dest1/helpers.md
	test/actual/multi/dest2/sub-dest/helpers.html
	test/actual/nested-layouts/helpers.html
	test/actual/paths/helpers.html