changed pop resource reqs, fixed road factor
Merge remote-tracking branch 'origin/master'