correct settings for demo 2048
Merge branch 'v3quick' of github.com:darkdukey/cocos2d-x into v3quick

Conflicts:
	tests/2048/hxgame.config
update lua binding for ccnotification
update mac player
update mac player
add welcome app
Build test project ok on Android
Merge remote-tracking branch 'dualface/v3quick' into v3quick