replaced absolute paths to relative ones
replaced absolute paths to relative ones
merged branch 'beta'