closed #4529: Stroke size and shadow offset don't consider ContentScaleFactor
closed #4530: Using 'Outside stroke' instead of 'Inside Stroke' for Label generated by 'Font name'. And fix stroke could not work on iOS7.
LabelTest , changed stroke color  to blue.
Adds another test for stroke.
Merge branch 'develop-label-stroke' of https://github.com/dumganhar/cocos2d-x into develop_label_fixs
Modify layout and add Boxes
Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes
label: Refactor implementation of shadow.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_label_fixs

Conflicts:
	cocos/2d/CCLabel.cpp
[AUTO]: updating luabinding automatically
remove unused code and fixed warning.
[Jenkins] Make build as failed when git fetch is failed
closed #4560, fixed UISlider hitTest Point
Merge pull request #5987 from lmskater/fix-git-fetch-fail

[Jenkins] Make build as failed when git fetch is failed
Merge pull request #5984 from CocosRobot/update_lua_bindings_1395813723

[AUTO]: updating luabinding automatically
issue #4401. resolve conflicts
Merge pull request #5985 from andyque/remove_pragma_mark

issue #4401, remove unused pargma mark macro
closed #4559: Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)
Warning fixes in SocketIOTest.cpp/ FileUtilsTest.cpp.
Merge pull request #5989 from dumganhar/iss4559-ios-64bit

closed #4559: Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)