add frame font "DejaVu Sans Mono 10"
Merge branch 'master' of github.com:sylvester/prelude

Conflicts:
	core/prelude-ui.el