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.
added kResolutionFixedHeight and kResolutionFixedWidth resolution policy

These new resolution policies will either ignore the width or height of the
specified design resolution size, but scale the ignored dimension, so it
matches the aspect ratio of the device.

Example:
A device with 854x480 pixels and a design resolution size set to 480x320
and the kResolutionFixedHeight policy, will create an internal canvas of
the size of 570x320px
If the device original size is 800x480 its internal size will be
534x320px
The height for both examples stays the same, the width is adjusted to match
the aspect ratio

Benefits:
- no distortions
- full canvas is usable, the visibility origin is 0/0
- I can use getWinSize() to place objects which is more intuitive
- for objects that should be placed at 0/0 I can use CGPointZero or 0/0 instead
  of the VisibilityRect methods, which is more readable
- using this method projects from the 1.x branch are probably much easier to
  port

Disadvantages:
- it is the developers responsibility to create the game code so that it
  supports multiple aspect ratios
[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.
[iOS] Updating ccbi file of js template.
Merge pull request #2228 from dumganhar/master

[iOS] Updating ccbi files of js template.
Merge pull request #5 from cocos2d/master

update cocos2d-x
Merge pull request #2229 from minggo/master

don't modify .project file when creating a new android project
Updating TestJavascript.vcxproj and WatermelonWithMe.vcxproj.
Updating the template of multi-platform-js for win32.
Updating multi-platform templates.
Removing unused codes.
Merge https://github.com/dumganhar/cocos2d-x into test-damganhar
Merge pull request #2230 from dumganhar/master

Updating the template of multi-platform.