Merge pull request #2 from cocos2d/master

update cocos2d/cocos2d-x
Merge pull request #3 from cocos2d/master

update cocos2d/cocos2d-x
Merge pull request #4 from cocos2d/master

update cocos2d/cocos2d-x
Remove tailing newlines from CCLog messaages.

Some CCLog message contained trailing newlines which
made the logs hard to read on many platforms.  The solution
here is to stip trailing newlines on those platforms, and also
to remove the newlines from the existing log messages.
Fix linux library path.

linux libraries were being built to "cocos2dx/lib/linux" rather
than just lib/linux.

Always used absolute path for -rpath linker argument.
[iOS] Using system font by `[UIFont systemFontOfSize]` when font name wasn't found.
issue #1841, TestJavascript-ios is obfuscated successfully
issue #1841, improve tools/closure-compiler/obfuscate.py to general usage, with input params
Fix linux build

The cocos library uses libpthread and libGL on linux, so we need to link
with them.
Merge pull request #5 from cocos2d/master

update cocos2d-x
issue #1841, TestJavascript is obfuscated successfully
update submodule samples/Javascript/Shared to the same ref ptr as master branch
update submodule scripting/javascript/bindings/generated to the same ref ptr as upstream/master branch.
remove jsb_*_.js from compile list
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into jsb_obfuscate
add icons into TestJavascript.xcodeproj
Remove "-o igncr" from CocosPlayer Android Eclipse project
- update README files
- format javascript sample README files like cpp samples
Update template android projects README files
Merge pull request #2239 from fape/android_eclipse2

Eclipse Project import - Windows part 2