Continued merge
Continued merge

zhutaorun/TouchScript,gdos/TouchScript,zhutaorun/TouchScript,zodsoft/TouchScript,ovieira/TouchScript,zhutaorun/TouchScript,ovieira/TouchScript,RainsSoft/TouchScript,gdos/TouchScript,RainsSoft/TouchScript,RainsSoft/TouchScript,ovieira/TouchScript,zodsoft/TouchScript,gdos/TouchScript,zodsoft/TouchScript