Merge upstream
Conflicts:
	.gitignore
	.gitmodules
	client/js/gmapper.js
	environment
	gruntfile.coffee
	package.json
	server/views/includes/ga.jade
	tutorials/git.md
	tutorials/js.md
	tutorials/readme.md