merge


Former-commit-id: b0ea19fca1f466b5be72f4c37a25f642c1931e7f
merge


Former-commit-id: 27f48e056a81d3105e092f7f2a202425affadcb3
Removed spurious files.


Former-commit-id: a4a5fce6b49ac4f8cc053b1d423406fa1d8b96d8
Removed spurious files.


Former-commit-id: 95c13eab2a8deb343540e9c8b0cc0cf0c3d823d7
Finish animationAndSkinningSerializer (last time).


Former-commit-id: ac5c59deca6e7b88b292d6678c65a06b89005992
Finish animationAndSkinningSerializer (last time).


Former-commit-id: e5e3133f462b4ae19d0ab0307b7fa411b6b3ab8a
Fixed serializer example.


Former-commit-id: 3dd1b29711c9186d77e93947b22851c367088ae6
Fixed serializer example.


Former-commit-id: cf7072886936e1fe9f148661c9e7a9566ad64506
Update assimp parser. Effectively adds loaded material references to AssetLibrary.


Former-commit-id: e6ab42bbad4d3cfc76eb1415dacfa400636ad4b6
Merge branch 'dev'

Conflicts:
	example/html-overlay/.gitignore
	example/html-overlay/asset/html/css/soccerpunch.css
	example/html-overlay/asset/html/gameInterface.html
	example/html-overlay/asset/html/image/ingame.png
	example/html-overlay/asset/texture/box.png
	example/html-overlay/premake5.lua
	example/html-overlay/src/Main.cpp
	plugin/lua/src/minko/component/LuaSurface.hpp
	premake5.lua

Former-commit-id: 124535c1cc5437728c63d2e8453515f950a83563
Added html-overlay to premake5.lua


Former-commit-id: 63042277fc0783daa08bc8f8b07a6e54758467e8
Update (de)serializer. Add simple texture formats handling.


Former-commit-id: 8b37a8e75e1ff47cbfc6e97e825c1d67c94251c3
Synchronous native HTTP loader


Former-commit-id: d1810721849de71ad2f7e98d580ab433938cb216
Synchronous native HTTP loader


Former-commit-id: 0f2c5b8b2df2301a90cf7d80fb832e6fade599b5
Synchronous native HTTP loader


Former-commit-id: 7e20f80e85d16afee38b16b221ca215d1b956f69
Added PNG parser registration in the assimp-example.


Former-commit-id: 820af969e888634bf08fe1b548391ef7e76c8662
Added PNG parser registration in the assimp-example.


Former-commit-id: ffd15f0fa7ec24612dabe6405c1d00bb773c0041
Fixed bad node hierarchy access in assimp plug-in.


Former-commit-id: 85805a8b9b5c134afb526ab894168bc8fe94db08
Fixed bad node hierarchy access in assimp plug-in.


Former-commit-id: b8819558e15f0ca919dcb17140671ea2ffcc5f50
Merge branch 'origin/dev'

Conflicts:
	example/serializer/src/main.cpp
	plugin/serializer/src/minko/file/Dependency.cpp

Former-commit-id: f692d45b8ba768b3281b2f49d1c94e7a19462ccc