fixed dev project lib locations
Merge remote-tracking branch 'origin/master' into 17