Aloy 913 app 1 5 x

For https://jira.appcelerator.org/browse/ALOY-913