Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
add config window top support
fix: copy map when getParseCallBackMap() and getParseObjectMap()
add GUIReader::registerTypeAndCallBack for std::function
replace NULL to nullptr

fix compile error
add getplatform function
add BillBorad and BillBoardTest
Merge pull request #92 from songmiao/billboard

add BillBorad and BillBoardTest
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard

Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
	tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
Merge pull request #93 from songmiao/billboard

Billboard Merge v3
add BillBoard to iOS project
merge extension EditBox to ui module
fix linux compile error
fix linux compile error
Merge branch 'v3' into customguireader
Merge branch 'v3' into mergeExtensionEditBox

Conflicts:
	cocos/ui/Android.mk
add Scale9Sprite to create method of ui::EditBox
remove Extension EditBox
Merge branch 'v3' into customguireader
Merge branch 'v3' into customguireader