merged upstream for Ghost update
Conflicts:
	.gitignore
	.gitmodules
	boilerplate.coffee
	boilerplate.js
	environment
	gruntfile.coffee
	package.json
	server/config/config.example.js
	tutorials/git.md
	tutorials/js.md
	tutorials/readme.md
Release v1.1.1