Merge remote-tracking branch 'origin/master'

Conflicts:
	css/jumbotron-narrow.css
update favicon path
Merge remote-tracking branch 'origin/master'