[DF-3491] Disabled creation of custom properties at GetCustomProperties()
Merge branch 'framework_0_5_5' into framework_0_5_5_customprops
Merge branch 'framework_0_5_5' into framework_0_5_5_customprops
merged with framework_0_5_5
Merge branch 'framework_0_5_5' into framework_0_5_5_customprops
[DF-185] Merged development into framework_0_5_5_customprops
[DF-3491] Small refactoring after code-review
Merge branch 'development' into framework_0_5_5_customprops
[DF-185] merged development into framework_0_5_5_customprops
[DF-3966] base changes in image helpers
Merge branch 'DAVA/DF-3965_LibJPEG'
[DF-3966] Base infrastructure according to confluence doc.
[DF-3966] base infrastructure of image system
[DF-3966] implementation of work with dds
[DF-3966] fix windows compilation
Merged with development
 [DF-3966] imtegrate image system into framework and resEditor
Merge branch 'origin/normal-mip-maps'

Conflicts:
	Libs/include/libpvr/PVRTGlobal.h
	Projects/MacOSFramework/Framework.xcodeproj/project.pbxproj
	Projects/UnitTests/Classes/GameCore.cpp
	Projects/UnitTests/TemplateProjectMacOS.xcodeproj/project.pbxproj
	Projects/UnitTests/TemplateProjectiPhone.xcodeproj/project.pbxproj
	Projects/Win32Framework/Win32Framework.vcxproj.filters
	Projects/iPhoneFramework/Framework.xcodeproj/project.pbxproj
	Sources/Internal/Render/Image.cpp
	Sources/Internal/Render/ImageLoader.cpp
	Sources/Internal/Render/LibDdsHelper.cpp
	Sources/Internal/Render/LibDdsHelper.h
	Sources/Internal/Render/LibPVRHelper.cpp
	Sources/Internal/Render/LibPVRHelper.h
	Sources/Internal/Render/LibPngHelpers.cpp
	Sources/Internal/Render/Material/NMaterial.cpp
	Sources/Internal/Render/Texture.cpp
	Sources/Tools/TextureCompression/DXTConverter.cpp
	Tools/ResourceEditor/Classes/ImageTools/ImageTools.cpp
	Tools/ResourceEditor/ResourceEditorQt.xcodeproj/project.pbxproj
	Tools/ResourceEditor/ResourceEditorQtVS2010.vcxproj.filters
[DF-3966] small refactoring of imageimage system and unit test
[DF-3966] small refactoring