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
Added Light
Added Light Class
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
GLProgram Added Light Shader
GLProgram Added Normal Matrix
Fixed GLProgram
add BillBoard to iOS project
Added Light Test
Added Point Light
Finished Point Light
Finished Directional Light
Finished Spot Light
Fixed Android compiled Problem
merge extension EditBox to ui module
Shader: Light struct modification