padding for labelalphatemplate
Better labelalpha handling with strange chars
Merge branch 'dev' into ms

Conflicts:
	data/schemata/bcf.rng