Merge-ovani Tangrami + Nova App struktura