refactor(client): refactor client
fix(files): file error
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/src/common/directives/display-State.js