Refreshing only modified files
Merge branch 'master' into calculating-ratings

* master:
  Refreshing only modified files

Conflicts:
	server/package.json