closed #2434:fixed path
Merge pull request #3355 from minggo/iss2434-refactor_androidmk

closed #2434: simply Android.mk
Fixed emscripten build error.
Adding CCControl js binding.
ControlEvent --> Control::EventType.
Merge branch 'develop' into carlomorgantinizynga-new_develop_merge

Conflicts:
	cocos2dx/Android.mk
make CCBAnimationManager::getSequenceId public; add method CCBAnimationManager::getSequenceDuration to get duration of timeline;
issue #2179: Fixing compilation errors on Linux.
issue #2170: Fixing compilaction errors on Emscripten.
Merge pull request #3340 from azmeuk/emscripten-fix

Fixed emscripten build error.
Merge branch 'carlomorgantinizynga-new_develop_merge' of https://github.com/dumganhar/cocos2d-x into carlomorgantinizynga-new_develop_merge
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into carlomorgantinizynga-new_develop_merge
issue #2170:  A typo fix.
issue #2170: Adding missing libs for Android.
issue #2170: [JSB] Label is abstract class now.
Merge pull request #3362 from dumganhar/carlomorgantinizynga-new_develop_merge

Merge PR https://github.com/cocos2d/cocos2d-x/pull/3342, New (experimental) label TTF
Merge branch 'new_develop_merge' of https://github.com/carlomorgantinizynga/cocos2d-x into carlomorgantinizynga-new_develop_merge
Merge pull request #3364 from dumganhar/carlomorgantinizynga-new_develop_merge

Merge PR https://github.com/cocos2d/cocos2d-x/pull/3342, some more clean up (code review)
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #3365 from CocosRobot/updategeneratedsubmodule_1375681464

[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings.