bumping version number
add the network flag for multisite db replacements
Accept a different folder name for plugin and theme repos than their repo name
bump dev version
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  bump dev version
  Accept a different folder name for plugin and theme repos than their repo name
  add the network flag for multisite db replacements
  bumping version number