fix wrong usage of map
Merge pull request #1228 from joshuastray/fix-wrong-usage-of-map

fix wrong usage of map
Merge pull request #1225 from pandamicro/develop

#1221: Enforce assets manager test case with script update
[AUTO] : updating jsbinding automatically
Merge pull request #1229 from CocosRobot/update_js_bindings_1419352535

[AUTO] : updating jsbinding automatically
Update EngineVersion
Update submodules