Font stuff etc
Merge remote-tracking branch 'origin/master'

Conflicts:
	web-app/css/main.css