Feature #5592: Reorder info.plist
Merge branch 'plugin_fb' of https://github.com/pandamicro/cocos2d-js into plugin_fb
Merge branch 'plugin_fb' of https://github.com/pandamicro/cocos2d-js into plugin_fb

Conflicts:
	samples/js-tests/project/proj.ios/Info.plist
Update plugin ref