preference screens
Merge branch 'Rianne'

Conflicts:
	css/style.css
	font-demo/demo-files/demo.css
	font-demo/demo-files/demo.js
preference screen