coll fixed
Merge branch 'master' of https://github.com/appcelerator/titanium_mobile_tizen