fix conflict
Merge branch 'develop' of github.com:wise9/enchant.js into develop

Conflicts:
	doc/core/en/files.html
	doc/core/en/index.html
	doc/core/en/symbols/_global_.html
	doc/core/en/symbols/enchant.CanvasGroup.html
	doc/core/en/symbols/enchant.Class.html
	doc/core/en/symbols/enchant.Entity.html
	doc/core/en/symbols/enchant.Event.html
	doc/core/en/symbols/enchant.EventTarget.html
	doc/core/en/symbols/enchant.Group.html
	doc/core/en/symbols/enchant.Label.html
	doc/core/en/symbols/enchant.Map.html
	doc/core/en/symbols/enchant.Node.html
	doc/core/en/symbols/enchant.Scene.html
	doc/core/en/symbols/enchant.Sound.html
	doc/core/en/symbols/enchant.Sprite.html
	doc/core/en/symbols/enchant.Surface.html
	doc/core/en/symbols/src/enchant.js.html
	doc/core/ja/files.html
	doc/core/ja/index.html
	doc/core/ja/symbols/_global_.html
	doc/core/ja/symbols/enchant.CanvasGroup.html
	doc/core/ja/symbols/enchant.Class.html
	doc/core/ja/symbols/enchant.Entity.html
	doc/core/ja/symbols/enchant.Event.html
	doc/core/ja/symbols/enchant.EventTarget.html
	doc/core/ja/symbols/enchant.Group.html
	doc/core/ja/symbols/enchant.Label.html
	doc/core/ja/symbols/enchant.Map.html
	doc/core/ja/symbols/enchant.Node.html
	doc/core/ja/symbols/enchant.Scene.html
	doc/core/ja/symbols/enchant.Sound.html
	doc/core/ja/symbols/enchant.Sprite.html
	doc/core/ja/symbols/enchant.Surface.html
	doc/plugins/en/files.html
	doc/plugins/en/index.html
	doc/plugins/en/symbols/_global_.html
	doc/plugins/en/symbols/enchant.Avatar.html
	doc/plugins/en/symbols/enchant.AvatarBG.html
	doc/plugins/en/symbols/enchant.CanvasGroup.html
	doc/plugins/en/symbols/enchant.Class.html
	doc/plugins/en/symbols/enchant.Entity.html
	doc/plugins/en/symbols/enchant.Event.html
	doc/plugins/en/symbols/enchant.EventTarget.html
	doc/plugins/en/symbols/enchant.Group.html
	doc/plugins/en/symbols/enchant.Label.html
	doc/plugins/en/symbols/enchant.Map.html
	doc/plugins/en/symbols/enchant.Node.html
	doc/plugins/en/symbols/enchant.PhyBoxSprite.html
	doc/plugins/en/symbols/enchant.PhyCircleSprite.html
	doc/plugins/en/symbols/enchant.Scene.html
	doc/plugins/en/symbols/enchant.Sound.html
	doc/plugins/en/symbols/enchant.Sprite.html
	doc/plugins/en/symbols/enchant.Surface.html
	doc/plugins/en/symbols/enchant.avatar.AvatarMonster.html
	doc/plugins/en/symbols/enchant.box2d.PhySprite.html
	doc/plugins/en/symbols/enchant.box2d.PhysicsWorld.html
	doc/plugins/en/symbols/enchant.gl.Bone.html
	doc/plugins/en/symbols/enchant.gl.Buffer.html
	doc/plugins/en/symbols/enchant.gl.Camera3D.html
	doc/plugins/en/symbols/enchant.gl.DirectionalLight.html
	doc/plugins/en/symbols/enchant.gl.Framebuffer.html
	doc/plugins/en/symbols/enchant.gl.KeyFrameManager.html
	doc/plugins/en/symbols/enchant.gl.Light3D.html
	doc/plugins/en/symbols/enchant.gl.Mesh.html
	doc/plugins/en/symbols/enchant.gl.PointLight.html
	doc/plugins/en/symbols/enchant.gl.Pose.html
	doc/plugins/en/symbols/enchant.gl.Quat.html
	doc/plugins/en/symbols/enchant.gl.Scene3D.html
	doc/plugins/en/symbols/enchant.gl.Shader.html
	doc/plugins/en/symbols/enchant.gl.Skeleton.html
	doc/plugins/en/symbols/enchant.gl.Sprite3D.html
	doc/plugins/en/symbols/enchant.gl.State.html
	doc/plugins/en/symbols/enchant.gl.Texture.html
	doc/plugins/en/symbols/enchant.gl.collision.AABB.html
	doc/plugins/en/symbols/enchant.gl.collision.BS.html
	doc/plugins/en/symbols/enchant.gl.collision.Bounding.html
	doc/plugins/en/symbols/enchant.gl.collision.OBB.html
	doc/plugins/en/symbols/enchant.gl.mmd.MAnimation.html
	doc/plugins/en/symbols/enchant.gl.mmd.MMesh.html
	doc/plugins/en/symbols/enchant.gl.mmd.MSprite3D.html
	doc/plugins/en/symbols/enchant.gl.physics.PhyBox.html
	doc/plugins/en/symbols/enchant.gl.physics.PhyCapsule.html
	doc/plugins/en/symbols/enchant.gl.physics.PhyContainer.html
	doc/plugins/en/symbols/enchant.gl.physics.PhyCube.html
	doc/plugins/en/symbols/enchant.gl.physics.PhyCylinder.html
	doc/plugins/en/symbols/enchant.gl.physics.PhyPlane.html
	doc/plugins/en/symbols/enchant.gl.physics.PhyScene3D.html
	doc/plugins/en/symbols/enchant.gl.physics.PhySphere.html
	doc/plugins/en/symbols/enchant.gl.physics.PhySprite3D.html
	doc/plugins/en/symbols/enchant.gl.physics.Rigid.html
	doc/plugins/en/symbols/enchant.gl.physics.RigidBox.html
	doc/plugins/en/symbols/enchant.gl.physics.RigidCapsule.html
	doc/plugins/en/symbols/enchant.gl.physics.RigidContainer.html
	doc/plugins/en/symbols/enchant.gl.physics.RigidCube.html
	doc/plugins/en/symbols/enchant.gl.physics.RigidCylinder.html
	doc/plugins/en/symbols/enchant.gl.physics.RigidPlane.html
	doc/plugins/en/symbols/enchant.gl.physics.RigidSphere.html
	doc/plugins/en/symbols/enchant.gl.physics.World.html
	doc/plugins/en/symbols/enchant.tl.ActionEventTarget.html
	doc/plugins/en/symbols/enchant.tl.ParallelAction.html
	doc/plugins/en/symbols/enchant.ui.APad.html
	doc/plugins/en/symbols/enchant.ui.Button.html
	doc/plugins/en/symbols/enchant.ui.Pad.html
	doc/plugins/en/symbols/enchant.widget.Alert.html
	doc/plugins/en/symbols/enchant.widget.AlertScene.html
	doc/plugins/en/symbols/enchant.widget.Button.html
	doc/plugins/en/symbols/enchant.widget.Confirm.html
	doc/plugins/en/symbols/enchant.widget.ConfirmScene.html
	doc/plugins/en/symbols/enchant.widget.EntityGroup.html
	doc/plugins/en/symbols/enchant.widget.GestureDetector.html
	doc/plugins/en/symbols/enchant.widget.IconMenu.html
	doc/plugins/en/symbols/enchant.widget.Input.html
	doc/plugins/en/symbols/enchant.widget.InputCheckBox.html
	doc/plugins/en/symbols/enchant.widget.InputScene.html
	doc/plugins/en/symbols/enchant.widget.InputSelectBox.html
	doc/plugins/en/symbols/enchant.widget.InputTextArea.html
	doc/plugins/en/symbols/enchant.widget.InputTextBox.html
	doc/plugins/en/symbols/enchant.widget.ListElement.html
	doc/plugins/en/symbols/enchant.widget.ListItem.html
	doc/plugins/en/symbols/enchant.widget.ListItemVertical.html
	doc/plugins/en/symbols/enchant.widget.ListView.html
	doc/plugins/en/symbols/enchant.widget.Modal.html
	doc/plugins/en/symbols/enchant.widget.NavigationBar.html
	doc/plugins/en/symbols/enchant.widget.Ninepatch.html
	doc/plugins/en/symbols/enchant.widget.Prompt.html
	doc/plugins/en/symbols/enchant.widget.PromptScene.html
	doc/plugins/en/symbols/enchant.widget.ScrollView.html
	doc/plugins/en/symbols/src/enchant.js.html
	doc/plugins/en/symbols/src/plugins_avatar.enchant.js.html
	doc/plugins/en/symbols/src/plugins_bone.gl.enchant.js.html
	doc/plugins/en/symbols/src/plugins_box2d.enchant.js.html
	doc/plugins/en/symbols/src/plugins_collada.gl.enchant.js.html
	doc/plugins/en/symbols/src/plugins_extendMap.enchant.js.html
	doc/plugins/en/symbols/src/plugins_gl.enchant.js.html
	doc/plugins/en/symbols/src/plugins_memory.enchant.js.html
	doc/plugins/en/symbols/src/plugins_mmd.gl.enchant.js.html
	doc/plugins/en/symbols/src/plugins_nineleap.enchant.js.html
	doc/plugins/en/symbols/src/plugins_physics.gl.enchant.js.html
	doc/plugins/en/symbols/src/plugins_primitive.gl.enchant.js.html
	doc/plugins/en/symbols/src/plugins_tl.enchant.js.html
	doc/plugins/en/symbols/src/plugins_twitter.enchant.js.html
	doc/plugins/en/symbols/src/plugins_ui.enchant.js.html
	doc/plugins/en/symbols/src/plugins_util.enchant.js.html
	doc/plugins/en/symbols/src/plugins_widget.enchant.js.html
	doc/plugins/ja/files.html
	doc/plugins/ja/index.html
	doc/plugins/ja/symbols/_global_.html
	doc/plugins/ja/symbols/enchant.Avatar.html
	doc/plugins/ja/symbols/enchant.AvatarBG.html
	doc/plugins/ja/symbols/enchant.CanvasGroup.html
	doc/plugins/ja/symbols/enchant.Class.html
	doc/plugins/ja/symbols/enchant.Entity.html
	doc/plugins/ja/symbols/enchant.Event.html
	doc/plugins/ja/symbols/enchant.EventTarget.html
	doc/plugins/ja/symbols/enchant.Group.html
	doc/plugins/ja/symbols/enchant.Label.html
	doc/plugins/ja/symbols/enchant.Map.html
	doc/plugins/ja/symbols/enchant.Node.html
	doc/plugins/ja/symbols/enchant.PhyBoxSprite.html
	doc/plugins/ja/symbols/enchant.PhyCircleSprite.html
	doc/plugins/ja/symbols/enchant.Scene.html
	doc/plugins/ja/symbols/enchant.Sound.html
	doc/plugins/ja/symbols/enchant.Sprite.html
	doc/plugins/ja/symbols/enchant.Surface.html
	doc/plugins/ja/symbols/enchant.avatar.AvatarMonster.html
	doc/plugins/ja/symbols/enchant.box2d.PhySprite.html
	doc/plugins/ja/symbols/enchant.box2d.PhysicsWorld.html
	doc/plugins/ja/symbols/enchant.gl.Bone.html
	doc/plugins/ja/symbols/enchant.gl.Buffer.html
	doc/plugins/ja/symbols/enchant.gl.Camera3D.html
	doc/plugins/ja/symbols/enchant.gl.DirectionalLight.html
	doc/plugins/ja/symbols/enchant.gl.FrameBuffer.html
	doc/plugins/ja/symbols/enchant.gl.KeyFrameManager.html
	doc/plugins/ja/symbols/enchant.gl.Light3D.html
	doc/plugins/ja/symbols/enchant.gl.Mesh.html
	doc/plugins/ja/symbols/enchant.gl.PointLight.html
	doc/plugins/ja/symbols/enchant.gl.Pose.html
	doc/plugins/ja/symbols/enchant.gl.Quat.html
	doc/plugins/ja/symbols/enchant.gl.Scene3D.html
	doc/plugins/ja/symbols/enchant.gl.Shader.html
	doc/plugins/ja/symbols/enchant.gl.Skeleton.html
	doc/plugins/ja/symbols/enchant.gl.Sprite3D.html
	doc/plugins/ja/symbols/enchant.gl.State.html
	doc/plugins/ja/symbols/enchant.gl.Texture.html
	doc/plugins/ja/symbols/enchant.gl.collision.AABB.html
	doc/plugins/ja/symbols/enchant.gl.collision.BS.html
	doc/plugins/ja/symbols/enchant.gl.collision.Bounding.html
	doc/plugins/ja/symbols/enchant.gl.collision.OBB.html
	doc/plugins/ja/symbols/enchant.gl.mmd.MAnimation.html
	doc/plugins/ja/symbols/enchant.gl.mmd.MMesh.html
	doc/plugins/ja/symbols/enchant.gl.mmd.MSprite3D.html
	doc/plugins/ja/symbols/enchant.gl.physics.PhyBox.html
	doc/plugins/ja/symbols/enchant.gl.physics.PhyCapsule.html
	doc/plugins/ja/symbols/enchant.gl.physics.PhyContainer.html
	doc/plugins/ja/symbols/enchant.gl.physics.PhyCube.html
	doc/plugins/ja/symbols/enchant.gl.physics.PhyCylinder.html
	doc/plugins/ja/symbols/enchant.gl.physics.PhyPlane.html
	doc/plugins/ja/symbols/enchant.gl.physics.PhyScene3D.html
	doc/plugins/ja/symbols/enchant.gl.physics.PhySphere.html
	doc/plugins/ja/symbols/enchant.gl.physics.PhySprite3D.html
	doc/plugins/ja/symbols/enchant.gl.physics.Rigid.html
	doc/plugins/ja/symbols/enchant.gl.physics.RigidBox.html
	doc/plugins/ja/symbols/enchant.gl.physics.RigidCapsule.html
	doc/plugins/ja/symbols/enchant.gl.physics.RigidContainer.html
	doc/plugins/ja/symbols/enchant.gl.physics.RigidCube.html
	doc/plugins/ja/symbols/enchant.gl.physics.RigidCylinder.html
	doc/plugins/ja/symbols/enchant.gl.physics.RigidPlane.html
	doc/plugins/ja/symbols/enchant.gl.physics.RigidSphere.html
	doc/plugins/ja/symbols/enchant.gl.physics.World.html
	doc/plugins/ja/symbols/enchant.tl.ActionEventTarget.html
	doc/plugins/ja/symbols/enchant.tl.ParallelAction.html
	doc/plugins/ja/symbols/enchant.ui.APad.html
	doc/plugins/ja/symbols/enchant.ui.Button.html
	doc/plugins/ja/symbols/enchant.ui.Pad.html
	doc/plugins/ja/symbols/enchant.widget.Alert.html
	doc/plugins/ja/symbols/enchant.widget.AlertScene.html
	doc/plugins/ja/symbols/enchant.widget.Button.html
	doc/plugins/ja/symbols/enchant.widget.Confirm.html
	doc/plugins/ja/symbols/enchant.widget.ConfirmScene.html
	doc/plugins/ja/symbols/enchant.widget.EntityGroup.html
	doc/plugins/ja/symbols/enchant.widget.GestureDetector.html
	doc/plugins/ja/symbols/enchant.widget.IconMenu.html
	doc/plugins/ja/symbols/enchant.widget.Input.html
	doc/plugins/ja/symbols/enchant.widget.InputCheckBox.html
	doc/plugins/ja/symbols/enchant.widget.InputScene.html
	doc/plugins/ja/symbols/enchant.widget.InputSelectBox.html
	doc/plugins/ja/symbols/enchant.widget.InputTextArea.html
	doc/plugins/ja/symbols/enchant.widget.InputTextBox.html
	doc/plugins/ja/symbols/enchant.widget.ListElement.html
	doc/plugins/ja/symbols/enchant.widget.ListItem.html
	doc/plugins/ja/symbols/enchant.widget.ListItemVertical.html
	doc/plugins/ja/symbols/enchant.widget.ListView.html
	doc/plugins/ja/symbols/enchant.widget.Modal.html
	doc/plugins/ja/symbols/enchant.widget.NavigationBar.html
	doc/plugins/ja/symbols/enchant.widget.Ninepatch.html
	doc/plugins/ja/symbols/enchant.widget.Prompt.html
	doc/plugins/ja/symbols/enchant.widget.PromptScene.html
	doc/plugins/ja/symbols/enchant.widget.ScrollView.html
	doc/plugins/ja/symbols/src/ja_plugins_avatar.enchant.js.html
	doc/plugins/ja/symbols/src/ja_plugins_bone.gl.enchant.js.html
	doc/plugins/ja/symbols/src/ja_plugins_box2d.enchant.js.html
	doc/plugins/ja/symbols/src/ja_plugins_collada.gl.enchant.js.html
	doc/plugins/ja/symbols/src/ja_plugins_extendMap.enchant.js.html
	doc/plugins/ja/symbols/src/ja_plugins_gl.enchant.js.html
	doc/plugins/ja/symbols/src/ja_plugins_memory.enchant.js.html
	doc/plugins/ja/symbols/src/ja_plugins_mmd.gl.enchant.js.html
	doc/plugins/ja/symbols/src/ja_plugins_nineleap.enchant.js.html
	doc/plugins/ja/symbols/src/ja_plugins_physics.gl.enchant.js.html
	doc/plugins/ja/symbols/src/ja_plugins_primitive.gl.enchant.js.html
	doc/plugins/ja/symbols/src/ja_plugins_tl.enchant.js.html
	doc/plugins/ja/symbols/src/ja_plugins_twitter.enchant.js.html
	doc/plugins/ja/symbols/src/ja_plugins_ui.enchant.js.html
	doc/plugins/ja/symbols/src/ja_plugins_util.enchant.js.html
	doc/plugins/ja/symbols/src/ja_plugins_widget.enchant.js.html
	doc/template/subtemplates/menu.tmpl
grunt