Merge branch 'hotfix/directory-separator'
Thx GwynethLlewelyn, fix exception with php5.3
Merge branch 'hotfix/uuid-validation' into develop