move files to client directory
copy server folder into dist if it exists
Merge branch 'develop'

* develop:
  copy server folder into dist if it exists
  move files to client directory