merge extension EditBox to ui module
fix linux compile error
fix linux compile error
Merge branch 'v3' into mergeExtensionEditBox

Conflicts:
	cocos/ui/Android.mk
add Scale9Sprite to create method of ui::EditBox
remove Extension EditBox
modify for compress
Merge branch 'v3' of github.com:super626/cocos2d-x into merge-bundle
Code Standards
Merge branch 'newcode' into v3

Conflicts:
	cocos/3d/CCBundle3D.cpp
modify log
remove 0.3 branch logic
make debug writable path the same as release
Adds MARK: TODO: FIXME: in code

Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme

Adds MARK: TODO: FIXME: in code
fix chipmunk
Merge pull request #120 from lvlonggame/v3

modify some logs and code standards
check running scene when checkVisibility
Merge pull request #7913 from chuanweizhang2013/v3fixed

make debug writable path the same as release
Merge pull request #7916 from andyque/fixChipumnk

remove chipmunk.h include in header file