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

Conflicts:
	assets/javascripts/main.js
	assets/stylesheets/main.css
	index.html