Merge branch 'master' of https://github.com/federico1525/Alloy-Samples

Conflicts:
Harness/app/styles/index.tss
ALOY-1004 test sample