before merge fix UI Lua
Merge branch 'wangguio' of http://github.com/liyonghelpme/mywangguo into wangguio

Conflicts:
	Resources/LuaScript/views/Loading.lua
init User HelloWorld setDeviceId