Fixed #191: add favicon.ico to the template
Merge pull request #195 from dingpinglv/Iss191_AddFavicon

Fixed #191: add favicon.ico to the template
Issue #4294: Make cc.Component extendable in JSB
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge pull request #196 from natural-law/master

Update the reference of submodule "cocos2d-console".
Merge pull request #197 from pandamicro/master

Issue #4294: Make cc.Component extendable in JSB
Issue #4294: Fix ccs.comAttribute API incompatible issue
Update README for the repo
Fixed #3767: use cc.DrawNode replace cc.DrawingPrimitive in tests
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss3767_DrawNode
Merge pull request #200 from dingpinglv/Iss3767_DrawNode

Fixed #3767: use cc.DrawNode replace cc.DrawingPrimitive in tests
Issue #4294: Fix bugs for cc.loader in JSB
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Update samples
Merge pull request #201 from pandamicro/master

Issue #4294: Fix bugs
Update submodules
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Issue #4294: Make cc.Component extendable
Update submodule cocos2d-x to cocos2d-html5/cocos2d-x
Merge pull request #202 from pandamicro/master

Update submodules