Added external fonts
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/css/defaults.css