Defined some paths for Zo2 core
Merge remote-tracking branch 'origin/master'