too
1;2802;0cMerge branch 'master' of https://github.com/maresc-g/rtype

Conflicts:
	rtype/Server/src/SpriteLoaderManager/SpriteLoader.cpp
Merge branch 'master' of https://github.com/maresc-g/rtype
Merge branch 'master' of https://github.com/maresc-g/rtype
m
Merge branch 'master' of https://github.com/maresc-g/rtype

Conflicts:
	rtype/Server/src/SpriteLoaderManager/SpriteLoader.cpp
Merge branch 'master' of https://github.com/maresc-g/rtype
modify map
Merge branch 'master' of https://github.com/maresc-g/rtype