Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	.gitignore
	Gruntfile.js
	assets/css/styles.css
	index.html