Modification header and coffee script.
Merge remote-tracking branch 'origin/master'

Conflicts:
	_assets/coffee/main.coffee