added scaling.js
Merge branch 'master' of https://github.com/infin-IT/M4nukB1Ru

Conflicts:
	DigitalSignage/main.qml
	build-DigitalSignage-Android_for_armeabi_v7a_GCC_4_8_Qt_5_3_0-Debug/android-build/assets/--Added-by-androiddeployqt--/qt_cache_pregenerated_file_list
	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/android-build/bin/dexedLibs/QtAndroid-bundled-baf48fae78d3ce9de9d43f3f35b34467.jar
	build-DigitalSignage-Android_for_armeabi_v7a_GCC_4_8_Qt_5_3_0-Debug/android-build/bin/dexedLibs/QtAndroidAccessibility-bundled-e12fd933d09894ffdc83ff2422bc685e.jar
	build-DigitalSignage-Android_for_armeabi_v7a_GCC_4_8_Qt_5_3_0-Debug/qrc_qml.obj