added missing asset png files
Merge pull request #5192 from MSOpenTech/wp8-assets

added missing asset png files
closed #3917: fix bug, CCControlSwitch behaves wrong when there are two exist in the scene
Merge pull request #5299 from dabingnn/mater_fix_controlSwitch

closed #3917: fix bug, CCControlSwitch behaves wrong when there are two ...
Android Flickering Bug Fix

When the new Activity is launched the screen starts flickering (Two
nearest frames are replacing each other all the time). This fix stops
flickering. More: http://www.cocos2d-x.org/forums/6/topics/34686
Merge pull request #5320 from seagullua/Android_FlickerFix

closed #3987: Screen will be flickering when switching to a new activity.
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
#3947 Simulate 'setTimeout' and 'setInterval' in JSB.
change difference designresolution as user-setting
Merge pull request #5334 from xingsenma/master

closed #3947 Adds 'setTimeout' and 'setInterval' for JSB.
Update CHANGELOG [ci skip]
Merge pull request #5335 from koowolf/designResolution

Using the correct resolution policy in CCEGLView::UpdateWindowSize.
Update CHANGELOG [ci skip]
Merge branch 'master' into master_nutty_modify_framework_addlayoutparameterclone