Merge remote-tracking branch 'gollum/master'

Conflicts:
	lib/gollum/frontend/public/gollum/css/gollum.css