Merge branches 'default-font' and 'font-size-float' into trunk

Conflicts:
	src/libkomapnik.py
Merge branch 'dashes' into trunk