Merge pull request cocos#5746 from holycanvas/v2.1.4-release

Revert "fix platform detection (cocos#5636)"

fix setTiledTileAt invalid bug (cocos#5713)

Merge v2.2.1-release into v2.2.1

Fix: An error occurs when the particle node is not activated. (cocos#…

…5554)

Fix: An error occurs when the particle node is not activated. (cocos#…

…5554)

refine texture.getHtmlElementObj api docs (cocos#5468)

Fixed matrix without restoring 3d nodes (cocos#5428)

Fixed matrix without restoring 3d nodes (cocos#5428)

Fix the problem that the profile does not display. (cocos#5402)

* Fix the problem that the profile does not display.

* revert code

Merge branch 'v2.2.0' into v2.3.0

* v2.2.0:
  fixed api link error. (cocos#4920)
  support alipay minigame (cocos#4880)
  fixed api docs (cocos#4918)
  add Edge browser type && fix webAudio bug on Edge and Baidu browser (cocos#4910)
  remove warning when upgrading editBox compnent (cocos#4916)
  move platform related code (cocos#4913)
  fix warn after subContextView modules are excluded (cocos#4737)
  refine code (cocos#4900)
  fix scrollView bug for 2d-tasks/issues/1555 (cocos#4894)

# Conflicts:
#	cocos2d/core/mesh/CCMesh.js
#	cocos2d/core/platform/CCSys.js
#	cocos2d/core/utils/profiler/CCProfiler.js