[TIMOB-15860] Fixed bug where relative paths are not prepended to JS files found in HTML files when there were no forward slashes.
Merge pull request #5676 from cb1kenobi/timob-15860

[TIMOB-15860] Fixed bug where relative paths are not prepended to JS fil...
[TIMOB-16914] Implementing buildtype for ios Analytics
Merge pull request #5675 from srahim/timob-16914

[TIMOB-16914]Implementing BuildType for iOS
Merge branch 'master' of git://github.com/appcelerator/titanium_mobile into TIMOB-13392

upstream updates