Merge branch 'branchX' of dev.ds-servers.com:sip/engine into branchX

build/engine/config/decals/decals.cfg

build/engine/textures/decal/decal_test.dds

build/engine/textures/decal/decal_test2.dds

build/engine/textures/decal/decal_test3.dds

docs/gen-entity.js

proj/SkyXEngine/vs2013/SkyXEngine.sln

proj/fbxplugin/vs2013/fbxplugin.vcxproj

proj/fbxplugin/vs2013/fbxplugin.vcxproj.filters

proj/msDSEExporter/vs2013/msDSEExporter.vcxproj

proj/msDSEExporter/vs2013/msDSEExporter.vcxproj.filters

proj/oggplugin/vs2013/oggplugin.vcxproj

proj/oggplugin/vs2013/oggplugin.vcxproj.filters

proj/sxae/vs2013/sxae.vcxproj

proj/sxae/vs2013/sxae.vcxproj.filters

proj/sxambient/vs2013/sxambient.vcxproj

proj/sxambient/vs2013/sxambient.vcxproj.filters

proj/sxanim/vs2013/sxanim.vcxproj

proj/sxanim/vs2013/sxanim.vcxproj.filters

proj/sxcore/vs2013/sxcore.vcxproj

proj/sxcore/vs2013/sxcore.vcxproj.filters