directory "apps" afegit per a navi
Merge remote-tracking branch 'origin/master'