[ALOY-989] Custom TSS issue when using mult. conditionals
[ALOY-378b] fix copying order so that platform assets take precedence
test and fix for TC-4063
Merge pull request #378 from skypanther/ALOY-989

[ALOY-989] Custom TSS issue when using mult. conditionals
renamed test app to ALOY-1003
Merge pull request #381 from skypanther/ALOY-378b

[ALOY-378b] fix copying order so that platform assets take precedence
Merge pull request #382 from pegli/tc-4063

**APPROVED** and merged. Thanks for your contribution!
Merge remote-tracking branch 'upstream/master' into ALOY-378
ALOY-362_fede - added global styles and other stuff