Fixed sym links
Fixed bare_project sym links
Merge remote-tracking branch 'origin/master' into chris