Merge pull request #14 from chukong/master

merge master
issue #401
Merge pull request #422 from ZhaoTianze/master

about issue #401
fix file mode
Merge branch 'master' of github.com:chukong/quick-cocos2d-x
update framework zip
modify ccs loader
Merge branch 'master' of github.com:chukong/quick-cocos2d-x
modify ccsloader
modify scrollview
modify setFlipX function
modify setflipy function
Merge pull request #3 from chukong/master

move
modify createWithInsets params
add  device.gettime()
add  device.timersub()
Merge pull request #426 from wland/master

add time api
modify scrollview
Merge branch 'master' of github.com:htlxyz/quick-cocos2d-x

Conflicts:
	lib/framework_precompiled/framework_precompiled.zip
Merge pull request #425 from htlxyz/master

Master
add event tracker and cleanup