qrc
Merge branch 'master' of https://github.com/infin-IT/M4nukB1Ru

Conflicts:
	DigitalSignage/qml.qrc