fixed: import of google fonts not working
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/styles/sass/custom/_fonts.sass