[TIMOB-15499] Fixed CLI packaging issue
Merge pull request #180 from pec1985/timob-15499

[TIMOB-15499] Fixed CLI packaging issue
[TIMOB-15257] Custom events missing "type" property
[TIMOB-15257] Fixed Ti.Properties for app settings
Merge pull request #182 from pec1985/timob-15257

[TIMOB-15257] Custom events missing "type" property
Merge branch 'refs/heads/master' into timob-15527

Conflicts:
	src/tibb/TiRootObject.cpp
[TIMOB-15527] Fixed conflicts