fix typo in proposal screen(bnc#866607)
release
Merge branch 'master' into fix_proposal

Conflicts:
	package/yast2-bootloader.changes