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

Conflicts:
	DigitalSignage/qml.qrc
	build-DigitalSignage-Android_for_armeabi_v7a_GCC_4_8_Qt_5_3_0-Debug/android-build/bin/QtApp-debug-unaligned.apk
	build-DigitalSignage-Android_for_armeabi_v7a_GCC_4_8_Qt_5_3_0-Debug/android-build/bin/QtApp-debug.apk
	build-DigitalSignage-Android_for_armeabi_v7a_GCC_4_8_Qt_5_3_0-Debug/android-build/bin/QtApp.ap_
	build-DigitalSignage-Android_for_armeabi_v7a_GCC_4_8_Qt_5_3_0-Debug/android-build/bin/build.prop
	build-DigitalSignage-Android_for_armeabi_v7a_GCC_4_8_Qt_5_3_0-Debug/qrc_qml.obj
	build-DigitalSignage-Desktop_Qt_5_3_0_MinGW_32bit-Debug/debug/DigitalSignage.exe