refactor PhysicsContact inherits from EventCustom; simplify emitting collision events
fix compile error
remove the workaround cast
GLView improvements

it is not longer a singleton
it is possible to specify the size
more fixes for new GLView API
API requirement is 10 again
Android works again
Merge branch 'develop' into glview_improvements
Merge branch 'develop' into glview_improvements

Conflicts:
	samples/Lua/HelloLua/Classes/AppDelegate.cpp
	template/multi-platform-lua/Classes/AppDelegate.cpp
Merge branch 'glview_improvements' of github.com:ricardoquesada/cocos2d-x into glview_improvements
restore it to platform=10
Works on Android
Only compile iOS files on iOS
Continue with the refactoring
Merge branch 'physics_event' of https://github.com/edwardzhou/cocos2d-x into iss3716_refactor_physicscontact

Conflicts:
	cocos/physics/CCPhysicsContact.h
issue #3716: refactor physics contact
closed #3716: edit lua support
Merge branch 'develop' into glview_improvements

Conflicts:
	CHANGELOG
	cocos/2d/platform/linux/CCApplication.cpp
	samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp
	samples/Cpp/HelloCpp/Classes/AppDelegate.cpp
	samples/Cpp/HelloCpp/Classes/AppMacros.h
	samples/Cpp/HelloCpp/proj.ios/AppController.mm
	samples/Cpp/HelloCpp/proj.mac/main.cpp
	samples/Cpp/SimpleGame/Classes/AppDelegate.cpp
	samples/Cpp/SimpleGame/proj.ios/AppController.mm
	samples/Cpp/SimpleGame/proj.mac/main.cpp
	samples/Cpp/TestCpp/Classes/AppDelegate.h
	samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp
	samples/Javascript/CocosDragonJS/proj.ios/AppController.mm
	samples/Javascript/CocosDragonJS/proj.mac/main.cpp
	samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp
	samples/Javascript/CrystalCraze/proj.ios/AppController.mm
	samples/Javascript/CrystalCraze/proj.mac/main.cpp
	samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp
	samples/Javascript/MoonWarriors/proj.ios/AppController.mm
	samples/Javascript/MoonWarriors/proj.mac/main.cpp
	samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp
	samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm
	samples/Javascript/WatermelonWithMe/proj.mac/main.cpp
	samples/Lua/HelloLua/Classes/AppDelegate.cpp
	samples/Lua/HelloLua/proj.ios/AppController.mm
	samples/Lua/HelloLua/proj.mac/main.cpp
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3716_refactor_physicscontact
Add `else` to `if`