Cleared rebase-conflicts in the cocos2d.vxcproj.filters.

Resolution same warnings (VS2010).
Merge remote-tracking branch 'remotes/upstream/extend-tilemap' into extend-tilemap